gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-09-28 17:19:17 +02:00
commit e7f28d8588
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/db_common.inc.php
View File

@ -91,12 +91,12 @@ if (isset($_REQUEST['submitcollation'])
. ' DEFAULT' . Util::getCharsetQueryPart($_REQUEST['db_collation']);
$result = $GLOBALS['dbi']->query($sql_query);
$message = Message::success();
/**
* Changes tables charset if requested by the user
*/
if (
isset($_REQUEST['change_all_tables_collations']) &&
isset($_REQUEST['change_all_tables_collations']) &&
$_REQUEST['change_all_tables_collations'] == 'on'
) {
list($tables, , , , , , , ,) = PhpMyAdmin\Util::getDbInfo($db, null);
@ -108,17 +108,17 @@ if (isset($_REQUEST['submitcollation'])
. 'DEFAULT '
. Util::getCharsetQueryPart($_REQUEST['db_collation']);
$GLOBALS['dbi']->query($sql_query);
/**
* Changes columns charset if requested by the user
*/
if (
isset($_REQUEST['change_all_tables_columns_collations']) &&
isset($_REQUEST['change_all_tables_columns_collations']) &&
$_REQUEST['change_all_tables_columns_collations'] == 'on'
) {
Operations::changeAllColumnsCollation($db, $tableName, $_REQUEST['db_collation']);
}
}
}
unset($db_charset);