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:
Diffstat (limited to 'libraries/Message.class.php')
-rw-r--r--libraries/Message.class.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index 2b054f2b2c..29cf41e6fc 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -501,7 +501,7 @@ class PMA_Message
*/
public function addMessage($message, $separator = ' ')
{
- if ($GLOBALS['PMA_String']->strlen($separator)) {
+ if (/*overload*/mb_strlen($separator)) {
$this->addedMessages[] = $separator;
}
@@ -628,13 +628,11 @@ class PMA_Message
{
$message = $this->message;
- /** @var PMA_String $pmaString */
- $pmaString = $GLOBALS['PMA_String'];
- if (0 === $pmaString->strlen($message)) {
+ if (0 === /*overload*/mb_strlen($message)) {
$string = $this->getString();
if (isset($GLOBALS[$string])) {
$message = $GLOBALS[$string];
- } elseif (0 === $pmaString->strlen($string)) {
+ } elseif (0 === /*overload*/mb_strlen($string)) {
$message = '';
} else {
$message = $string;