Merge remote-tracking branch 'origin/master'

2014-04-10 17:30:23 +02:00 · 2014-04-10 17:30:23 +02:00 · 26d49eb959
commit 26d49eb959
parent 4ac57f42ad fb96545044
2 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog
 - bug #4353 makeProfilingChart is not defined
 - bug #4355 Precision specifier for DOUBLE type is truncated
 - bug #4346 Incorrect "Export incomplete" message
+- bug #4359 Notices on create table page 

 4.1.12.0 (2014-03-27)
 - bug #4334 Add event : datepicker won't open
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@ -151,8 +151,9 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
        isset($submit_default_current_timestamp)
        ? $submit_default_current_timestamp : null,
        $comments_map, isset($fields_meta) ? $fields_meta : null, $is_backup,
-        isset($move_columns) ? $move_columns : null, $cfgRelation, $available_mime,
-        $mime_map
+        isset($move_columns) ? $move_columns : null, $cfgRelation,
+        isset($available_mime) ? $available_mime : null,
+        isset($mime_map) ? $mime_map : null
    );
 } // end for
 $html = PMA_getHtmlForTableCreateOrAddField(