Merge branch 'develop' into experimental/session-start

This commit is contained in:
Kijin Sung 2015-07-22 21:41:13 +09:00
commit 6470da0d5d
12 changed files with 80 additions and 30 deletions

View file

@ -657,7 +657,14 @@ class documentItem extends Object
function getExtraValue($idx)
{
$extra_vars = $this->getExtraVars();
return $extra_vars[$idx]->value;
if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
{
return $extra_vars[$idx]->getValue();
}
else
{
return '';
}
}
function getExtraValueHTML($idx)
@ -685,7 +692,15 @@ class documentItem extends Object
$extra_eid[$key->eid] = $key;
}
}
return $extra_eid[$eid]->value;
if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
{
return $extra_eid[$eid]->getValue();
}
else
{
return '';
}
}
function getExtraEidValueHTML($eid)
@ -696,7 +711,15 @@ class documentItem extends Object
{
$extra_eid[$key->eid] = $key;
}
return $extra_eid[$eid]->getValueHTML();
if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
{
return $extra_eid[$eid]->getValueHTML();
}
else
{
return '';
}
}
function getExtraVarsValue($key)