Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne 2015-03-24 20:14:03 +05:30
commit 0a89ee137f

View File

@ -237,7 +237,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
$html_output .= PMA_Util::getImage('s_asci.png') . '&nbsp';
}
$html_output .= '<label for="select_db_collation">' . __('Collation')
. ':</label>' . "\n"
. '</label>' . "\n"
. '</legend>' . "\n"
. PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION,