Fix for json_decode

WedgeSama · WedgeSama · commit 703a993493a3 · 2015-10-26T17:22:47.000+01:00
Check the var type before using json_decode.
diff --git a/src/Extension.php b/src/Extension.php
@@ -59,7 +59,7 @@ public function initialize()
     public function contentParser(Content $content)
     {
         foreach ($content->contenttype['fields'] as $key => $options) {
-            if ($options['type'] == 'array') {
+            if ($options['type'] == 'array' && is_string($content->values[$key])) {
                 $values = json_decode($content->values[$key], true);
                 $content->values[$key] = array_values($values);
             }
@@ -84,7 +84,7 @@ public function getChildrenContexts(array $context, $key)
         $values = array();
         if (array_key_exists($key, $parentValues)) {
             $json = json_decode($parentValues[$key], true);
-            $values = ($json) ? array_values($json) : array();
+            $values = $json?array_values($json):array();
         }
 
         foreach ($values as $num => $vFields) {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function initialize()`
`59`	`59`	`public function contentParser(Content $content)`
`60`	`60`	`{`
`61`	`61`	`foreach ($content->contenttype['fields'] as $key => $options) {`
`62`		`- if ($options['type'] == 'array') {`
	`62`	`+ if ($options['type'] == 'array' && is_string($content->values[$key])) {`
`63`	`63`	`$values = json_decode($content->values[$key], true);`
`64`	`64`	`$content->values[$key] = array_values($values);`
`65`	`65`	`}`
`@@ -84,7 +84,7 @@ public function getChildrenContexts(array $context, $key)`
`84`	`84`	`$values = array();`
`85`	`85`	`if (array_key_exists($key, $parentValues)) {`
`86`	`86`	`$json = json_decode($parentValues[$key], true);`
`87`		`- $values = ($json) ? array_values($json) : array();`
	`87`	`+ $values = $json?array_values($json):array();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`foreach ($values as $num => $vFields) {`