diff options
| author | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-08-15 20:19:20 +0400 |
|---|---|---|
| committer | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-09-06 12:44:03 +0400 |
| commit | 9b77d746aba7ded13aa68f98ac4b5840f2d438f8 (patch) | |
| tree | f16106e0d721859423406121628a12f03dc704e6 /setup | |
| parent | 4960f208e20ad7fd8b77cef9dcc82772c29def92 (diff) | |
Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/frames/index.inc.php | 3 | ||||
| -rw-r--r-- | setup/lib/ConfigGenerator.class.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index a24d058ef9..16823da658 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -64,7 +64,8 @@ if (!$config_writable || !$config_readable) { // // Check https connection // -$is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; +$is_https = !empty($_SERVER['HTTPS']) + && $GLOBALS['PMA_String']->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 5497eff4ab..07a6a65fc0 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 (strpos($k, '/') === false) { + if ($GLOBALS['PMA_String']->strpos($k, '/') === false) { $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k); $ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf); } |