diff options
Diffstat (limited to 'libraries/mult_submits.lib.php')
| -rw-r--r-- | libraries/mult_submits.lib.php | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php index fece2e569d..c10904b4a7 100644 --- a/libraries/mult_submits.lib.php +++ b/libraries/mult_submits.lib.php @@ -34,11 +34,9 @@ function PMA_getUrlParams( 'query_type' => $what, 'reload' => (! empty($reload) ? 1 : 0), ); - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strpos(' ' . $action, 'db_') == 1) { + if (/*overload*/mb_strpos(' ' . $action, 'db_') == 1) { $_url_params['db']= $db; - } elseif ($pmaString->strpos(' ' . $action, 'tbl_') == 1 + } elseif (/*overload*/mb_strpos(' ' . $action, 'tbl_') == 1 || $what == 'row_delete' ) { $_url_params['db']= $db; @@ -104,9 +102,6 @@ function PMA_getQueryStrFromSelected( $selected_cnt = count($selected); $deletes = false; - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - for ($i = 0; $i < $selected_cnt; $i++) { switch ($query_type) { case 'row_delete': @@ -231,11 +226,10 @@ function PMA_getQueryStrFromSelected( case 'replace_prefix_tbl': $current = $selected[$i]; - $subFromPrefix = $pmaString - ->substr($current, 0, $pmaString->strlen($from_prefix)); + $subFromPrefix = /*overload*/mb_substr($current, 0, /*overload*/mb_strlen($from_prefix)); if ($subFromPrefix == $from_prefix) { $newtablename = $to_prefix - . $pmaString->substr($current, $pmaString->strlen($from_prefix)); + . /*overload*/mb_substr($current, /*overload*/mb_strlen($from_prefix)); } else { $newtablename = $current; } @@ -250,7 +244,7 @@ function PMA_getQueryStrFromSelected( case 'copy_tbl_change_prefix': $current = $selected[$i]; $newtablename = $to_prefix . - $pmaString->substr($current, $pmaString->strlen($from_prefix)); + /*overload*/mb_substr($current, /*overload*/mb_strlen($from_prefix)); // COPY TABLE AND CHANGE PREFIX PATTERN $a_query = 'CREATE TABLE ' . PMA_Util::backquote($newtablename) |