last fix for itemtype (missing in previous pr)

orthagh · orthagh · commit 5f69dc391928 · 2017-02-23T14:23:05.000+01:00
same
diff --git a/inc/tag.class.php b/inc/tag.class.php
@@ -84,8 +84,7 @@ public function showForm($ID, $options = array()) {
          }
       }
       $type_menu_values = json_decode($this->fields['type_menu']);
-      if ($type_menu_values === false
-          || $type_menu_values === NULL) {
+      if (!is_array($type_menu_values)) {
          $type_menu_values = [];
       }
 
@@ -310,8 +309,8 @@ static function getSpecificValueToDisplay($field, $values, array $options = arra
       switch ($field) {
          case 'type_menu':
             $itemtypes = json_decode($values[$field]);
-            if (json_last_error() !== JSON_ERROR_NONE) {
-               return __("None");
+            if (!is_array($itemtypes)) {
+               return "&nbsp;";
             }
             $itemtype_names = [];
             foreach ($itemtypes as $itemtype) {

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ public function showForm($ID, $options = array()) {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`$type_menu_values = json_decode($this->fields['type_menu']);`
`87`		`- if ($type_menu_values === false`
`88`		`- \|\| $type_menu_values === NULL) {`
	`87`	`+ if (!is_array($type_menu_values)) {`
`89`	`88`	`$type_menu_values = [];`
`90`	`89`	`}`
`91`	`90`
`@@ -310,8 +309,8 @@ static function getSpecificValueToDisplay($field, $values, array $options = arra`
`310`	`309`	`switch ($field) {`
`311`	`310`	`case 'type_menu':`
`312`	`311`	`$itemtypes = json_decode($values[$field]);`
`313`		`- if (json_last_error() !== JSON_ERROR_NONE) {`
`314`		`- return __("None");`
	`312`	`+ if (!is_array($itemtypes)) {`
	`313`	`+ return " ";`
`315`	`314`	`}`
`316`	`315`	`$itemtype_names = [];`
`317`	`316`	`foreach ($itemtypes as $itemtype) {`