1 files changed, 13 insertions, 16 deletions

diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php
index fdab075e15..7f6554f34b 100644
--- a/libraries/plugins/import/ImportCsv.class.php
+++ b/libraries/plugins/import/ImportCsv.class.php
@@ -104,9 +104,6 @@ class ImportCsv extends AbstractImportCsv
         // but we use directly from $_POST
         global $error, $timeout_passed, $finished, $message;
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         $replacements = array(
             '\\n'   => "\n",
             '\\t'   => "\t",
@@ -118,7 +115,7 @@ class ImportCsv extends AbstractImportCsv
         $csv_new_line = strtr($csv_new_line, $replacements);
 
         $param_error = false;
-        if ($pmaString->strlen($csv_terminated) < 1) {
+        if (/*overload*/mb_strlen($csv_terminated) < 1) {
             $message = PMA_Message::error(
                 __('Invalid parameter for CSV import: %s')
             );
@@ -133,21 +130,21 @@ class ImportCsv extends AbstractImportCsv
             // confuses this script.
             // But the parser won't work correctly with strings so we allow just
             // one character.
-        } elseif ($pmaString->strlen($csv_enclosed) > 1) {
+        } elseif (/*overload*/mb_strlen($csv_enclosed) > 1) {
             $message = PMA_Message::error(
                 __('Invalid parameter for CSV import: %s')
             );
             $message->addParam(__('Columns enclosed with'), false);
             $error = true;
             $param_error = true;
-        } elseif ($pmaString->strlen($csv_escaped) != 1) {
+        } elseif (/*overload*/mb_strlen($csv_escaped) != 1) {
             $message = PMA_Message::error(
                 __('Invalid parameter for CSV import: %s')
             );
             $message->addParam(__('Columns escaped with'), false);
             $error = true;
             $param_error = true;
-        } elseif ($pmaString->strlen($csv_new_line) != 1
+        } elseif (/*overload*/mb_strlen($csv_new_line) != 1
             && $csv_new_line != 'auto'
         ) {
             $message = PMA_Message::error(
@@ -238,7 +235,7 @@ class ImportCsv extends AbstractImportCsv
 
         $col_count = 0;
         $max_cols = 0;
-        $csv_terminated_len = $pmaString->strlen($csv_terminated);
+        $csv_terminated_len = /*overload*/mb_strlen($csv_terminated);
         while (! ($finished && $i >= $len) && ! $error && ! $timeout_passed) {
             $data = PMA_importGetNextChunk();
             if ($data === false) {
@@ -254,7 +251,7 @@ class ImportCsv extends AbstractImportCsv
 
                 // Force a trailing new line at EOF to prevent parsing problems
                 if ($finished && $buffer) {
-                    $finalch = $pmaString->substr($buffer, -1);
+                    $finalch = /*overload*/mb_substr($buffer, -1);
                     if ($csv_new_line == 'auto'
                         && $finalch != "\r"
                         && $finalch != "\n"
@@ -270,17 +267,17 @@ class ImportCsv extends AbstractImportCsv
                 // Do not parse string when we're not at the end
                 // and don't have new line inside
                 if (($csv_new_line == 'auto'
-                    && $pmaString->strpos($buffer, "\r") === false
-                    && $pmaString->strpos($buffer, "\n") === false)
+                    && /*overload*/mb_strpos($buffer, "\r") === false
+                    && /*overload*/mb_strpos($buffer, "\n") === false)
                     || ($csv_new_line != 'auto'
-                    && $pmaString->strpos($buffer, $csv_new_line) === false)
+                    && /*overload*/mb_strpos($buffer, $csv_new_line) === false)
                 ) {
                     continue;
                 }
             }
 
             // Current length of our buffer
-            $len = $pmaString->strlen($buffer);
+            $len = /*overload*/mb_strlen($buffer);
             // Currently parsed char
             $ch = $buffer[$i];
             if ($csv_terminated_len > 1 && $ch == $csv_terminated[0]) {
@@ -544,8 +541,8 @@ class ImportCsv extends AbstractImportCsv
                     $line++;
                     $csv_finish = false;
                     $values = array();
-                    $buffer = $pmaString->substr($buffer, $i + 1);
-                    $len = $pmaString->strlen($buffer);
+                    $buffer = /*overload*/mb_substr($buffer, $i + 1);
+                    $len = /*overload*/mb_strlen($buffer);
                     $i = 0;
                     $lasti = -1;
                     $ch = $buffer[0];
@@ -580,7 +577,7 @@ class ImportCsv extends AbstractImportCsv
                 }
             }
 
-            if ($pmaString->strlen($db)) {
+            if (/*overload*/mb_strlen($db)) {
                 $result = $GLOBALS['dbi']->fetchResult('SHOW TABLES');
                 $tbl_name = 'TABLE ' . (count($result) + 1);
             } else {