diff options
| author | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-09-28 22:53:01 +0400 |
|---|---|---|
| committer | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-09-28 22:53:01 +0400 |
| commit | 3de88162ff628a50d220d559954362c21028cc65 (patch) | |
| tree | a467d672686ca88369e27b04964950b98928b64f /setup | |
| parent | 38eb5948a0e19991620b7d9c47c1dc0f284e291a (diff) | |
Replace PMA_String uses by mb_* calls.
Remove part of unused variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/frames/index.inc.php | 2 | ||||
| -rw-r--r-- | setup/lib/ConfigGenerator.class.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 16823da658..c291c3c327 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -65,7 +65,7 @@ if (!$config_writable || !$config_readable) { // Check https connection // $is_https = !empty($_SERVER['HTTPS']) - && $GLOBALS['PMA_String']->strtolower($_SERVER['HTTPS']) == 'on'; + && /*overload*/mb_strtolower($_SERVER['HTTPS']) == 'on'; if (!$is_https) { $text = __( 'You are not using a secure connection; all data (including potentially ' diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index 07a6a65fc0..af83025691 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -71,7 +71,7 @@ class ConfigGenerator } // keep 1d array keys which are present in $persist_keys (config.values.php) foreach (array_keys($persistKeys) as $k) { - if ($GLOBALS['PMA_String']->strpos($k, '/') === false) { + if (/*overload*/mb_strpos($k, '/') === false) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); $ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf); } |