diff options
Diffstat (limited to 'libraries/select_lang.lib.php')
| -rw-r--r-- | libraries/select_lang.lib.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 23d6e0ff19..99508a5f69 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -18,11 +18,8 @@ if (! defined('PHPMYADMIN')) { */ function PMA_languageName($tmplang) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $lang_name = ucfirst( - $pmaString->substr($pmaString->strrchr($tmplang[0], '|'), 1) + /*overload*/mb_substr(/*overload*/mb_strrchr($tmplang[0], '|'), 1) ); // Include native name if non empty @@ -90,7 +87,7 @@ function PMA_langCheck() // prevent XSS $accepted_languages = PMA_getenv('HTTP_ACCEPT_LANGUAGE'); if ($accepted_languages - && false === $GLOBALS['PMA_String']->strpos($accepted_languages, '<') + && false === /*overload*/mb_strpos($accepted_languages, '<') ) { foreach (explode(',', $accepted_languages) as $lang) { if (PMA_langDetect($lang, 1)) { @@ -160,7 +157,7 @@ function PMA_langDetect($str, $envType) // $envType = 1 for the 'HTTP_ACCEPT_LANGUAGE' environment variable, // 2 for the 'HTTP_USER_AGENT' one $expr = $value[0]; - if ($GLOBALS['PMA_String']->strpos($expr, '[-_]') === false) { + if (/*overload*/mb_strpos($expr, '[-_]') === false) { $expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr); } $pattern1 = '/^(' . addcslashes($expr, '/') . ')(;q=[0-9]\\.[0-9])?$/i'; |