Issue #456: Only call prepareRow if $row is an array.

chasingmaxwell · Mateu Aguiló Bosch · commit cf2c518124c5 · 2015-04-14T15:16:19.000+02:00
commit d569551 Author: Peter Sieg <chasingmaxwell@gmail.com> Date: Wed Apr 1 16:44:04 2015 -0400 Only call prepareRow if $row is an array.
diff --git a/plugins/formatter/hal_json/RestfulFormatterHalJson.class.php b/plugins/formatter/hal_json/RestfulFormatterHalJson.class.php
@@ -30,7 +30,9 @@ public function prepare(array $data) {
     $output = array();
 
     foreach ($data as &$row) {
-      $row = $this->prepareRow($row, $output);
+      if (is_array($row)) {
+        $row = $this->prepareRow($row, $output);
+      }
     }
 
     $output[$curies_resource] = $data;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ public function prepare(array $data) {`
`30`	`30`	`$output = array();`
`31`	`31`
`32`	`32`	`foreach ($data as &$row) {`
`33`		`- $row = $this->prepareRow($row, $output);`
	`33`	`+ if (is_array($row)) {`
	`34`	`+ $row = $this->prepareRow($row, $output);`
	`35`	`+ }`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`$output[$curies_resource] = $data;`