Fix function name: PMA_array_merge_recursive -> PMA_arrayMergeRecursive

2 files changed, 9 insertions, 9 deletions

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index b18144482b..43ab566937 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -560,7 +560,7 @@ class PMA_Config
         unset($cfg['Servers']);
 
         $this->default = $cfg;
-        $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $cfg);
 
         $this->error_config_default_file = false;
 
@@ -630,7 +630,7 @@ class PMA_Config
             );
         }
 
-        $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $cfg);
         $this->checkPmaAbsoluteUri();
         $this->checkFontsize();
 
@@ -716,8 +716,8 @@ class PMA_Config
         // backup some settings
         $org_fontsize = $this->settings['fontsize'];
         // load config array
-        $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
-        $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $config_data);
+        $GLOBALS['cfg'] = PMA_arrayMergeRecursive($GLOBALS['cfg'], $config_data);
         if (defined('PMA_MINIMUM_COMMON')) {
             return;
         }
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index cf95ff55ef..befea5dcf1 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -353,7 +353,7 @@ function PMA_get_real_size($size = 0)
  * merges array recursive like array_merge_recursive() but keyed-values are
  * always overwritten.
  *
- * array PMA_array_merge_recursive(array $array1[, array $array2[, array ...]])
+ * array PMA_arrayMergeRecursive(array $array1[, array $array2[, array ...]])
  *
  * @param array   array to merge
  * @param array   array to merge
@@ -364,7 +364,7 @@ function PMA_get_real_size($size = 0)
  * @see     http://php.net/array_merge
  * @see     http://php.net/array_merge_recursive
  */
-function PMA_array_merge_recursive()
+function PMA_arrayMergeRecursive()
 {
     switch(func_num_args()) {
     case 0 :
@@ -381,7 +381,7 @@ function PMA_array_merge_recursive()
         }
         foreach ($args[1] as $key2 => $value2) {
             if (isset($args[0][$key2]) && !is_int($key2)) {
-                $args[0][$key2] = PMA_array_merge_recursive(
+                $args[0][$key2] = PMA_arrayMergeRecursive(
                     $args[0][$key2], $value2
                 );
             } else {
@@ -401,9 +401,9 @@ function PMA_array_merge_recursive()
         break;
     default :
         $args = func_get_args();
-        $args[1] = PMA_array_merge_recursive($args[0], $args[1]);
+        $args[1] = PMA_arrayMergeRecursive($args[0], $args[1]);
         array_shift($args);
-        return call_user_func_array('PMA_array_merge_recursive', $args);
+        return call_user_func_array('PMA_arrayMergeRecursive', $args);
         break;
     }
 }