The branch, master has been updated via 3ac470ec00c851b698bd3a23efbb3a5ee70e1173 (commit) via 32320f907904a0a491dad17b20929b4c320fd763 (commit) via 694d0d55639bfe23d111e1f217aacdb69b4f8346 (commit) from 8b7180e05a0e261aaa2e84ac002ef25c7a6624ea (commit)
- Log ----------------------------------------------------------------- commit 3ac470ec00c851b698bd3a23efbb3a5ee70e1173 Merge: 8b7180e05a0e261aaa2e84ac002ef25c7a6624ea 32320f907904a0a491dad17b20929b4c320fd763 Author: Michal Čihař michal@cihar.com Date: Thu Oct 21 10:12:44 2010 +0200
Merge remote branch 'mort-dev/master'
commit 32320f907904a0a491dad17b20929b4c320fd763 Author: Michal Čihař michal@cihar.com Date: Thu Oct 21 10:12:22 2010 +0200
No collation selection for Drizzle.
commit 694d0d55639bfe23d111e1f217aacdb69b4f8346 Author: Michal Čihař michal@cihar.com Date: Thu Oct 21 10:12:10 2010 +0200
Provide description for utf8 in Drizzle.
-----------------------------------------------------------------------
Summary of changes: libraries/mysql_charsets.lib.php | 2 +- main.php | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 2463f1f..89aef18 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -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(); diff --git a/main.php b/main.php index 6e515d9..3f5f106 100644 --- a/main.php +++ b/main.php @@ -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" - - . 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"; + 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"; + } // not Drizzle } // end of if ($server > 0) echo '</ul>'; echo '</div>';
hooks/post-receive
-
Michal Čihař