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

Merge remote branch 'mort-dev/master'

Browse Source
This commit is contained in:
Michal Čihař
2010-10-21 10:12:44 +02:00
parent 8b7180e05a 32320f9079
commit 3ac470ec00
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mysql_charsets.lib.php
View File

@@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) {
if (PMA_MYSQL_MAJOR_VERSION > 2009) {
/* There are no charsets in Drizzle */
$GLOBALS['mysql_charsets'] = array();
$GLOBALS['mysql_charsets_descriptions'] = array();
$GLOBALS['mysql_charsets_descriptions'] = array('utf8' => 'UTF-8 Unicode');
$GLOBALS['mysql_charsets_count'] = 0;
$GLOBALS['mysql_charsets_available'] = array();
$GLOBALS['mysql_collations'] = array();

26
main.php
View File

@@ -91,19 +91,21 @@ if ($server > 0
'./user_password.php?' . $common_url_query, null, null, 'change_password_anchor');
}
} // end if
echo ' <li id="li_select_mysql_collation">';
echo ' <form method="post" action="index.php" target="_parent">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
. ' ' . __('MySQL connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n"
. ' </label>' . "\n"
if (PMA_MYSQL_MAJOR_VERSION < 2009) {
echo ' <li id="li_select_mysql_collation">';
echo ' <form method="post" action="index.php" target="_parent">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
. ' ' . __('MySQL connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n"
. ' </label>' . "\n"
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
. ' <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n"
. ' </form>' . "\n"
. ' </li>' . "\n";
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
. ' <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n"
. ' </form>' . "\n"
. ' </li>' . "\n";
} // not Drizzle
} // end of if ($server > 0)
echo '</ul>';
echo '</div>';