Mass modifications to use PMA_String.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/sql.php b/sql.php
index 0630122f06..291bf43f8d 100644
--- a/sql.php
+++ b/sql.php
@@ -57,10 +57,13 @@ if (! empty($goto)) {
     $is_gotofile  = true;
 } // end if
 
+/** @var PMA_String $pmaString */
+$pmaString = $GLOBALS['PMA_String'];
 if (! isset($err_url)) {
     $err_url = (! empty($back) ? $back : $goto)
         . '?' . PMA_URL_getCommon($GLOBALS['db'])
-        . ((strpos(' ' . $goto, 'db_') != 1 && strlen($table))
+        . (($pmaString->strpos(' ' . $goto, 'db_') != 1
+            && $pmaString->strlen($table))
             ? '&table=' . urlencode($table)
             : ''
         );
@@ -110,7 +113,7 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
 
 // Default to browse if no query set and we have table
 // (needed for browsing from DefaultTabTable)
-if (empty($sql_query) && strlen($table) && strlen($db)) {
+if (empty($sql_query) && $pmaString->strlen($table) && $pmaString->strlen($db)) {
     $sql_query = PMA_getDefaultSqlQueryForBrowse($db, $table);
 
     // set $goto to what will be displayed if query returns 0 rows