diff options
author | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-08-15 20:19:20 +0400 |
---|---|---|
committer | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-09-06 12:44:03 +0400 |
commit | 9b77d746aba7ded13aa68f98ac4b5840f2d438f8 (patch) | |
tree | f16106e0d721859423406121628a12f03dc704e6 /sql.php | |
parent | 4960f208e20ad7fd8b77cef9dcc82772c29def92 (diff) |
Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Diffstat (limited to 'sql.php')
-rw-r--r-- | sql.php | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 |