Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

2014-01-08 21:32:24 +01:00 · 2014-01-08 21:32:24 +01:00 · 4bd02f8fb1
commit 4bd02f8fb1
parent b21a11ab1a 917c26703f
2 changed files with 3 additions and 1 deletions
--- a/1
+++ b/1
@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog

 4.1.5.0 (not yet released)
 - bug #3780 Allow aborting loading pages
+- bug #4223 Database list: Create database misses collation column

 4.1.4.0 (2014-01-07)
 - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
--- a/db_create.php
+++ b/db_create.php
@ -107,7 +107,8 @@ if (! $result) {
            );
        } else {
            $current = array(
-                'SCHEMA_NAME' => $_POST['new_db']
+                'SCHEMA_NAME' => $_POST['new_db'],
+                'DEFAULT_COLLATION_NAME' => $db_collation_for_ajax
            );
        }