re #91: PHP 5.2 fix

joomlatools · Sep 16, 2014 · be46a1f · be46a1f
1 parent 4ad1d1e
commit be46a1f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/code/libraries/koowa/libraries/legacy.php b/code/libraries/koowa/libraries/legacy.php
@@ -27,9 +27,9 @@ function lcfirst( $str )
 
 if (!function_exists('array_replace_recursive'))
 {
-    function array_replace_recursive($array, $array1)
+    if (!function_exists('recurse'))
     {
-        function recurse($array, $array1)
+        function recurse_for_array_replace($array, $array1)
         {
             foreach ($array1 as $key => $value)
             {
@@ -40,14 +40,18 @@ function recurse($array, $array1)
 
                 // overwrite the value in the base array
                 if (is_array($value)) {
-                    $value = recurse($array[$key], $value);
+                    $value = recurse_for_array_replace($array[$key], $value);
                 }
 
                 $array[$key] = $value;
             }
 
             return $array;
         }
+    }
+
+    function array_replace_recursive($array, $array1)
+    {
 
         // handle the arguments, merge one by one
         $args = func_get_args();
@@ -59,7 +63,7 @@ function recurse($array, $array1)
         for ($i = 1; $i < count($args); $i++)
         {
             if (is_array($args[$i])) {
-                $array = recurse($array, $args[$i]);
+                $array = recurse_for_array_replace($array, $args[$i]);
             }
         }
         return $array;