diff options
Diffstat (limited to 'libraries/operations.lib.php')
| -rw-r--r-- | libraries/operations.lib.php | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index e9097a151c..4ebea24b73 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -313,7 +313,7 @@ function PMA_getSqlQueryAndCreateDbBeforeCopy() 'SHOW VARIABLES LIKE "lower_case_table_names"', 0, 1 ); if ($lowerCaseTableNames === '1') { - $_REQUEST['newname'] = $GLOBALS['PMA_String']->strtolower( + $_REQUEST['newname'] = /*overload*/mb_strtolower( $_REQUEST['newname'] ); } @@ -855,9 +855,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation, ); } // end if (ARIA) - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - if ($pmaString->strlen($auto_increment) > 0 + if (/*overload*/mb_strlen($auto_increment) > 0 && ($is_myisam_or_aria || $is_innodb || $is_pbxt) ) { $html_output .= '<tr><td>' @@ -878,7 +876,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation, if (isset($possible_row_formats[$tbl_storage_engine])) { $current_row_format - = $pmaString->strtoupper($GLOBALS['showtable']['Row_format']); + = /*overload*/mb_strtoupper($GLOBALS['showtable']['Row_format']); $html_output .= '<tr><td>' . '<label for="new_row_format">ROW_FORMAT</label></td>' . '<td>'; @@ -1451,10 +1449,8 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, . PMA_Util::sqlAddSlashes($_REQUEST['comment']) . '\''; } - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; if (! empty($newTblStorageEngine) - && $pmaString->strtolower($newTblStorageEngine) !== $pmaString->strtolower($GLOBALS['tbl_storage_engine']) + && /*overload*/mb_strtolower($newTblStorageEngine) !== /*overload*/mb_strtolower($GLOBALS['tbl_storage_engine']) ) { $table_alters[] = 'ENGINE = ' . $newTblStorageEngine; } @@ -1513,11 +1509,11 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, } $newRowFormat = $_REQUEST['new_row_format']; - $newRowFormatLower = $pmaString->strtolower($newRowFormat); + $newRowFormatLower = /*overload*/mb_strtolower($newRowFormat); if (($is_myisam_or_aria || $is_innodb || $is_pbxt) && ! empty($newRowFormat) - && (!$pmaString->strlen($row_format) - || $newRowFormatLower !== $pmaString->strtolower($row_format)) + && (!/*overload*/mb_strlen($row_format) + || $newRowFormatLower !== /*overload*/mb_strtolower($row_format)) ) { $table_alters[] = 'ROW_FORMAT = ' . PMA_Util::sqlAddSlashes($newRowFormat); } @@ -1535,7 +1531,7 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys, */ function PMA_setGlobalVariablesForEngine($tbl_storage_engine) { - $upperTblStorEngine = $GLOBALS['PMA_String']->strtoupper($tbl_storage_engine); + $upperTblStorEngine = /*overload*/mb_strtoupper($tbl_storage_engine); //Options that apply to MYISAM usually apply to ARIA $is_myisam_or_aria = ($upperTblStorEngine == 'MYISAM' @@ -1601,7 +1597,7 @@ function PMA_getQueryAndResultForPartition() /** - * Move or copy a table + * Move or copy a table * * @param string $db current database name * @param string $table current table name |