1 files changed, 7 insertions, 19 deletions

diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
index 15e8e4438f..031436b01d 100644
--- a/libraries/DBQbe.class.php
+++ b/libraries/DBQbe.class.php
@@ -334,7 +334,7 @@ class PMA_DbQbe
                     $this->_columnNames[] = $each_column;
                     // increase the width if necessary
                     $this->_form_column_width = max(
-                        $GLOBALS['PMA_String']->strlen($each_column),
+                        /*overload*/mb_strlen($each_column),
                         $this->_form_column_width
                     );
                 } // end foreach
@@ -455,9 +455,6 @@ class PMA_DbQbe
         $html_output .= '<th>' . __('Sort:') . '</th>';
         $new_column_count = 0;
 
-        /** @var PMA_String $pmaStr */
-        $pmaStr = $GLOBALS['PMA_String'];
-
         for (
             $colInd = 0;
             $colInd < $this->_criteria_column_count;
@@ -481,7 +478,7 @@ class PMA_DbQbe
             // then sorting is not available, Fix for Bug #570698
             if (isset($_REQUEST['criteriaSort'][$colInd])
                 && isset($_REQUEST['criteriaColumn'][$colInd])
-                && $pmaStr->substr($_REQUEST['criteriaColumn'][$colInd], -2) == '.*'
+                && /*overload*/mb_substr($_REQUEST['criteriaColumn'][$colInd], -2) == '.*'
             ) {
                 $_REQUEST['criteriaSort'][$colInd] = '';
             } //end if
@@ -999,9 +996,6 @@ class PMA_DbQbe
      */
     private function _getWhereClause()
     {
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         $where_clause = '';
         $criteria_cnt = 0;
         for (
@@ -1016,7 +1010,7 @@ class PMA_DbQbe
                 && isset($this->_curAndOrCol)
             ) {
                 $where_clause .= ' '
-                    . $pmaString->strtoupper($this->_curAndOrCol[$last_where]) . ' ';
+                    . /*overload*/mb_strtoupper($this->_curAndOrCol[$last_where]) . ' ';
             }
             if (! empty($this->_curField[$column_index])
                 && ! empty($this->_curCriteria[$column_index])
@@ -1052,7 +1046,7 @@ class PMA_DbQbe
                     && $column_index
                 ) {
                     $qry_orwhere .= ' '
-                        . $pmaString->strtoupper($this->_curAndOrCol[$last_orwhere])
+                        . /*overload*/mb_strtoupper($this->_curAndOrCol[$last_orwhere])
                         . ' ';
                 }
                 if (! empty($this->_curField[$column_index])
@@ -1071,7 +1065,7 @@ class PMA_DbQbe
             }
             if (! empty($qry_orwhere)) {
                 $where_clause .= "\n"
-                    .  $pmaString->strtoupper(
+                    .  /*overload*/mb_strtoupper(
                         isset($this->_curAndOrRow[$row_index])
                         ? $this->_curAndOrRow[$row_index] . ' '
                         : ''
@@ -1096,9 +1090,6 @@ class PMA_DbQbe
         $orderby_clause = '';
         $orderby_clauses = array();
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         for (
             $column_index = 0;
             $column_index < $this->_criteria_column_count;
@@ -1113,7 +1104,7 @@ class PMA_DbQbe
                 continue;
             }
 
-            if ($pmaString->substr($this->_curField[$column_index], -2) == '.*') {
+            if (/*overload*/mb_substr($this->_curField[$column_index], -2) == '.*') {
                 continue;
             }
 
@@ -1325,9 +1316,6 @@ class PMA_DbQbe
         $where_clause_columns = array();
         $where_clause_tables = array();
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Now we need all tables that we have in the where clause
         for (
             $column_index = 0, $nb = count($this->_criteria);
@@ -1344,7 +1332,7 @@ class PMA_DbQbe
             // Now we know that our array has the same numbers as $criteria
             // we can check which of our columns has a where clause
             if (! empty($this->_criteria[$column_index])) {
-                if ($pmaString->substr($this->_criteria[$column_index], 0, 1) == '='
+                if (/*overload*/mb_substr($this->_criteria[$column_index], 0, 1) == '='
                     || /*$pmaString->*/stristr($this->_criteria[$column_index], 'is')
                 ) {
                     $where_clause_columns[$column] = $column;