From f8c42cc10b7d1cd75a82c04abb1c2f46e9cd5482 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 4 Aug 2018 21:08:03 +0900 Subject: [PATCH] Fix #1049 disappearing zero values in extravar --- classes/extravar/Extravar.class.php | 6 +++--- modules/document/document.model.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index 7c48f9293..803c77bf3 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -396,7 +396,7 @@ class ExtraItem foreach($default as $v) { $checked = ''; - if($value && in_array(trim($v), $value)) + if(strval($value) !== '' && in_array(trim($v), $value)) { $checked = ' checked="checked"'; } @@ -414,7 +414,7 @@ class ExtraItem foreach($default as $v) { $selected = ''; - if($value && in_array(trim($v), $value)) + if(strval($value) !== '' && in_array(trim($v), $value)) { $selected = ' selected="selected"'; } @@ -428,7 +428,7 @@ class ExtraItem foreach($default as $v) { $checked = ''; - if($value && in_array(trim($v), $value)) + if(strval($value) !== '' && in_array(trim($v), $value)) { $checked = ' checked="checked"'; } diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 7d857ac66..1684981d4 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -81,7 +81,7 @@ class documentModel extends document $output = $this->getDocumentExtraVarsFromDB($document_srls); foreach($output->data as $key => $val) { - if(!$val->value) + if(strval($val->value) === '') { continue; }