diff options
Diffstat (limited to 'libraries/config/Validator.class.php')
| -rw-r--r-- | libraries/config/Validator.class.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php index 3b15f59c9e..2f5859e48a 100644 --- a/libraries/config/Validator.class.php +++ b/libraries/config/Validator.class.php @@ -47,9 +47,6 @@ class PMA_Validator return $validators; } - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // not in setup script: load additional validators for user // preferences we need original config values not overwritten // by user preferences, creating a new PMA_Config instance is a @@ -62,9 +59,9 @@ class PMA_Validator continue; } for ($i = 1, $nb = count($uv); $i < $nb; $i++) { - if ($pmaString->substr($uv[$i], 0, 6) == 'value:') { + if (/*overload*/mb_substr($uv[$i], 0, 6) == 'value:') { $uv[$i] = PMA_arrayRead( - $pmaString->substr($uv[$i], 6), + /*overload*/mb_substr($uv[$i], 6), $GLOBALS['PMA_Config']->base_settings ); } @@ -116,7 +113,7 @@ class PMA_Validator $key_map = array(); foreach ($values as $k => $v) { $k2 = $isPostSource ? str_replace('-', '/', $k) : $k; - $k2 = $GLOBALS['PMA_String']->strpos($k2, '/') + $k2 = /*overload*/mb_strpos($k2, '/') ? $cf->getCanonicalPath($k2) : $k2; $key_map[$k2] = $k; |