Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-19 08:50:49 +01:00
commit f6997121bd

View File

@ -2047,7 +2047,7 @@ function PMA_changeAllColumnsCollation($db, $table, $tbl_collation)
$GLOBALS['dbi']->selectDb($db);
$change_all_collations_query = 'ALTER TABLE '
. PMA_Util::backquote($table)
. PMA\libraries\Util::backquote($table)
. ' CONVERT TO';
list($charset) = explode('_', $tbl_collation);