1 files changed, 16 insertions, 16 deletions

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 84ef0c078a..2a81af2108 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -267,7 +267,7 @@ class PMA_Table
             foreach ($results as $result) {
                 $analyzed_sql[0]['create_table_fields'][$result['COLUMN_NAME']]
                     = array(
-                        'type' => $pmaString->strtoupper($result['DATA_TYPE'])
+                        'type' => /*overload*/mb_strtoupper($result['DATA_TYPE'])
                     );
             }
         } else {
@@ -340,7 +340,7 @@ class PMA_Table
 
         // any of known merge engines?
         return in_array(
-            $GLOBALS['PMA_String']->strtoupper($engine),
+            /*overload*/mb_strtoupper($engine),
             array('MERGE', 'MRG_MYISAM')
         );
     }
@@ -434,8 +434,8 @@ class PMA_Table
         /** @var PMA_String $pmaString */
         $pmaString = $GLOBALS['PMA_String'];
 
-        $is_timestamp = $pmaString->strpos(
-            $pmaString->strtoupper($type),
+        $is_timestamp = /*overload*/mb_strpos(
+            /*overload*/mb_strtoupper($type),
             'TIMESTAMP'
         ) !== false;
 
@@ -797,7 +797,7 @@ class PMA_Table
 
         $source = PMA_Util::backquote($source_db)
             . '.' . PMA_Util::backquote($source_table);
-        if (! isset($target_db) || ! $pmaString->strlen($target_db)) {
+        if (! isset($target_db) || ! /*overload*/mb_strlen($target_db)) {
             $target_db = $source_db;
         }
 
@@ -859,7 +859,7 @@ class PMA_Table
                 );
                 // ANSI_QUOTES might be a subset of sql_mode, for example
                 // REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
-                if (false !== $pmaString->strpos($server_sql_mode, 'ANSI_QUOTES')) {
+                if (false !== /*overload*/mb_strpos($server_sql_mode, 'ANSI_QUOTES')) {
                     $table_delimiter = 'quote_double';
                 } else {
                     $table_delimiter = 'quote_backtick';
@@ -949,7 +949,7 @@ class PMA_Table
                 $cnt = $parsed_sql['len'] - 1;
 
                 for ($j = $i; $j < $cnt; $j++) {
-                    $dataUpper = $pmaString->strtoupper($parsed_sql[$j]['data']);
+                    $dataUpper = /*overload*/mb_strtoupper($parsed_sql[$j]['data']);
                     if ($parsed_sql[$j]['type'] == 'alpha_reservedWord'
                         && $dataUpper == 'CONSTRAINT'
                     ) {
@@ -986,7 +986,7 @@ class PMA_Table
                 $cnt = $parsed_sql['len'] - 1;
 
                 for ($j = $i; $j < $cnt; $j++) {
-                    $dataUpper = $pmaString->strtoupper($parsed_sql[$j]['data']);
+                    $dataUpper = /*overload*/mb_strtoupper($parsed_sql[$j]['data']);
                     if ($parsed_sql[$j]['type'] == 'alpha_reservedWord'
                         && $dataUpper == 'CONSTRAINT'
                     ) {
@@ -1269,7 +1269,7 @@ class PMA_Table
             return false;
         }
 
-        if (! $GLOBALS['PMA_String']->strlen($table_name)) {
+        if (! /*overload*/mb_strlen($table_name)) {
             // zero length
             return false;
         }
@@ -1589,8 +1589,8 @@ class PMA_Table
             // check whether we can get from pmadb
             $_SESSION['tmpval']['table_uiprefs'][$server_id][$this->db_name]
             [$this->name]
-                = ($pmaString->strlen($GLOBALS['cfg']['Server']['pmadb'])
-                    && $pmaString->strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
+                = (/*overload*/mb_strlen($GLOBALS['cfg']['Server']['pmadb'])
+                    && /*overload*/mb_strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
                 )
                     ?  $this->getUiPrefsFromDb()
                     : array();
@@ -1638,7 +1638,7 @@ class PMA_Table
                     if (substr_compare(
                         $each_col,
                         $colname,
-                        $pmaString->strlen($each_col) - $pmaString->strlen($colname)
+                        /*overload*/mb_strlen($each_col) - /*overload*/mb_strlen($colname)
                     ) === 0) {
                         return $this->uiprefs[$property];
                     }
@@ -1728,8 +1728,8 @@ class PMA_Table
         $pmaString = $GLOBALS['PMA_String'];
 
         // check if pmadb is set
-        if ($pmaString->strlen($GLOBALS['cfg']['Server']['pmadb'])
-            && $pmaString->strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
+        if (/*overload*/mb_strlen($GLOBALS['cfg']['Server']['pmadb'])
+            && /*overload*/mb_strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
         ) {
             return $this->saveUiprefsToDb();
         }
@@ -1755,8 +1755,8 @@ class PMA_Table
             $pmaString = $GLOBALS['PMA_String'];
 
             // check if pmadb is set
-            if ($pmaString->strlen($GLOBALS['cfg']['Server']['pmadb'])
-                && $pmaString->strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
+            if (/*overload*/mb_strlen($GLOBALS['cfg']['Server']['pmadb'])
+                && /*overload*/mb_strlen($GLOBALS['cfg']['Server']['table_uiprefs'])
             ) {
                 return $this->saveUiprefsToDb();
             }