1 files changed, 11 insertions, 11 deletions

diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php
index 32668eb12c..2a07dc1eb3 100644
--- a/libraries/tbl_relation.lib.php
+++ b/libraries/tbl_relation.lib.php
@@ -52,21 +52,21 @@ function PMA_backquoteSplit($text)
     $pmaString = $GLOBALS['PMA_String'];
 
     $elements = array();
-    $final_pos = $pmaString->strlen($text) - 1;
+    $final_pos = /*overload*/mb_strlen($text) - 1;
     $pos = 0;
     while ($pos <= $final_pos) {
-        $first_backquote = $pmaString->strpos($text, '`', $pos);
-        $second_backquote = $pmaString->strpos($text, '`', $first_backquote + 1);
+        $first_backquote = /*overload*/mb_strpos($text, '`', $pos);
+        $second_backquote = /*overload*/mb_strpos($text, '`', $first_backquote + 1);
         // after the second one, there might be another one which means
         // this is an escaped backquote
         if ($second_backquote < $final_pos && '`' == $text[$second_backquote + 1]) {
             $second_backquote
-                = $pmaString->strpos($text, '`', $second_backquote + 2);
+                = /*overload*/mb_strpos($text, '`', $second_backquote + 2);
         }
         if (false === $first_backquote || false === $second_backquote) {
             break;
         }
-        $elements[] = $pmaString->substr(
+        $elements[] = /*overload*/mb_substr(
             $text, $first_backquote, $second_backquote - $first_backquote + 1
         );
         $pos = $second_backquote + 1;
@@ -574,7 +574,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
                     'Engine'
                 );
                 if (isset($engine)
-                    && $pmaString->strtoupper($engine) == $tbl_storage_engine
+                    && /*overload*/mb_strtoupper($engine) == $tbl_storage_engine
                 ) {
                     $tables[] = $row[0];
                 }
@@ -587,7 +587,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
             );
             while ($row = $GLOBALS['dbi']->fetchRow($tables_rs)) {
                 if (isset($row[1])
-                    && $pmaString->strtoupper($row[1]) == $tbl_storage_engine
+                    && /*overload*/mb_strtoupper($row[1]) == $tbl_storage_engine
                 ) {
                     $tables[] = $row[0];
                 }
@@ -746,7 +746,7 @@ function PMA_sendHtmlForTableDropdownList()
 
     $foreign = isset($_REQUEST['foreign']) && $_REQUEST['foreign'] === 'true';
     if ($foreign) {
-        $tbl_storage_engine = $pmaString->strtoupper(
+        $tbl_storage_engine = /*overload*/mb_strtoupper(
             PMA_Table::sGetStatusInfo(
                 $_REQUEST['db'],
                 $_REQUEST['table'],
@@ -769,7 +769,7 @@ function PMA_sendHtmlForTableDropdownList()
 
         while ($row = $GLOBALS['dbi']->fetchArray($tables_rs)) {
             if (isset($row['Engine'])
-                && $pmaString->strtoupper($row['Engine']) == $tbl_storage_engine
+                && /*overload*/mb_strtoupper($row['Engine']) == $tbl_storage_engine
             ) {
                 $tables[] = htmlspecialchars($row['Name']);
             }
@@ -784,7 +784,7 @@ function PMA_sendHtmlForTableDropdownList()
         );
         while ($row = $GLOBALS['dbi']->fetchArray($tables_rs)) {
             if ($foreign && PMA_DRIZZLE) {
-                $engine = $pmaString->strtoupper(
+                $engine = /*overload*/mb_strtoupper(
                     PMA_Table::sGetStatusInfo(
                         $_REQUEST['foreignDb'],
                         $row[0],
@@ -1154,7 +1154,7 @@ function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_m
         if (! empty($tmp_error_create)) {
             $seen_error = true;
 
-            if ($GLOBALS['PMA_String']->substr($tmp_error_create, 1, 4) == '1005') {
+            if (/*overload*/mb_substr($tmp_error_create, 1, 4) == '1005') {
                 $message = PMA_Message::error(
                     __('Error creating foreign key on %1$s (check data types)')
                 );