Merge branch 'develop' of github.com:xpressengine/xe-core into develop

This commit is contained in:
akasima 2014-04-10 13:48:31 +09:00
commit fce5ed6001

View file

@ -518,7 +518,7 @@ class documentController extends document
{ {
foreach($extra_keys as $idx => $extra_item) foreach($extra_keys as $idx => $extra_item)
{ {
$value = ''; $value = NULL;
if(isset($obj->{'extra_vars'.$idx})) if(isset($obj->{'extra_vars'.$idx}))
{ {
$tmp = $obj->{'extra_vars'.$idx}; $tmp = $obj->{'extra_vars'.$idx};
@ -528,7 +528,7 @@ class documentController extends document
$value = trim($tmp); $value = trim($tmp);
} }
else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name}); else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
if(!isset($value)) continue; if($value == NULL) continue;
$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid); $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
} }
} }