ISLANDORA-1537: PHP 5.6 Warning in array_traverse_path()

patdunlavey · patdunlavey · commit bf8774f22bb3 · 2015-11-05T10:30:01.000-05:00
Notice when using PHP 5.6: Only variable references should be returned by reference in array_traverse_path(). This patch returns a variable with the value of FALSE, rather than returning FALSE itself.
diff --git a/Array.inc b/Array.inc
@@ -54,7 +54,8 @@ function &array_traverse_path(array &$array, array $indices) {
   $point = &$array;
   foreach ($indices as $index) {
     if (empty($point[$index])) {
-      return FALSE;
+      $result = FALSE;
+      return $result;
     }
     $point = &$point[$index];
   }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ function &array_traverse_path(array &$array, array $indices) {`
`54`	`54`	`$point = &$array;`
`55`	`55`	`foreach ($indices as $index) {`
`56`	`56`	`if (empty($point[$index])) {`
`57`		`- return FALSE;`
	`57`	`+ $result = FALSE;`
	`58`	`+ return $result;`
`58`	`59`	`}`
`59`	`60`	`$point = &$point[$index];`
`60`	`61`	`}`