Skip to content

Commit 053b914

Browse files
committed
Merge pull request #13 from dfeyer/bugfix-searcharrayhelper
BUGFIX: SearchArrayHelper::flatten break if the valus is not an array
2 parents 834503e + 7d7d087 commit 053b914

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ class SearchArrayHelper implements ProtectedContextAwareInterface {
2323
/**
2424
* Concatenate arrays or values to a new array
2525
*
26-
* @param array|mixed $array1 First array or value
27-
* @param array|mixed $array2 Second array or value
28-
* @param array|mixed $array_ Optional variable list of additional arrays / values
26+
* @param array|mixed $arrays First array or value
2927
* @return array The array with concatenated arrays or values
3028
*/
3129
public function flatten($arrays) {
3230
$return = array();
33-
array_walk_recursive($arrays, function($a) use (&$return) { $return[] = $a; });
31+
if (is_array($arrays)) {
32+
array_walk_recursive($arrays, function ($a) use (&$return) {
33+
$return[] = $a;
34+
});
35+
}
3436
return $return;
3537
}
3638

@@ -41,7 +43,7 @@ public function flatten($arrays) {
4143
* @return boolean
4244
*/
4345
public function allowsCallOfMethod($methodName) {
44-
return TRUE;
46+
return true;
4547
}
4648

4749
}

0 commit comments

Comments
 (0)