Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2012-06-01 20:11:59 +0400
committerMadhura Jayaratne <madhura.cj@gmail.com>2012-06-01 20:11:59 +0400
commitddc575ca04a46029685e2c055fbec2a631bdd738 (patch)
tree66d5727d59c80c52b6d7840408486fed552d218e /libraries
parent0b95a1b4467185d23e541f21635a39e7d4ec898b (diff)
Fix function name: PMA_array_remove -> PMA_arrayRemove
Diffstat (limited to 'libraries')
-rw-r--r--libraries/config/ConfigFile.class.php4
-rw-r--r--libraries/core.lib.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index ea19fbd5b0..d7e7002dd1 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -240,7 +240,7 @@ class ConfigFile
|| (empty($value) && empty($default_value) && (defined('PMA_SETUP')
|| empty($current_global)))
) {
- PMA_array_remove($path, $_SESSION[$this->_id]);
+ PMA_arrayRemove($path, $_SESSION[$this->_id]);
return;
}
}
@@ -512,7 +512,7 @@ class ConfigFile
$c = $_SESSION[$this->_id];
foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) {
PMA_array_write($map_to, $c, PMA_array_read($map_from, $c));
- PMA_array_remove($map_from, $c);
+ PMA_arrayRemove($map_from, $c);
}
return $c;
}
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 44cfc309e4..9c4c56b068 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -686,7 +686,7 @@ function PMA_array_write($path, &$array, $value)
*
* @return void
*/
-function PMA_array_remove($path, &$array)
+function PMA_arrayRemove($path, &$array)
{
$keys = explode('/', $path);
$keys_last = array_pop($keys);