diff --git a/ChangeLog b/ChangeLog index 6bbade4f9..dc632046d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-10-13 Marc Delisle + * tbl_addfield.php: undefined $field_collation under MySQL 4.0.x + 2005-10-13 Michal Čihař * Documentation.html: Fix URL rewriting not to match empty parts. * calendar.php, themes.php, libraries/auth/config.auth.lib.php, diff --git a/tbl_addfield.php b/tbl_addfield.php index 2642b35fb..a2015a0cc 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -57,7 +57,7 @@ if (isset($submit_num_fields)) { continue; } - $query .= PMA_generateFieldSpec($field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], $field_collation[$i], $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], isset($field_comments[$i]) ? $field_comments[$i] : '', $field_primary, $i); + $query .= PMA_generateFieldSpec($field_name[$i], $field_type[$i], $field_length[$i], $field_attribute[$i], isset($field_collation[$i]) ? $field_collation[$i] : '', $field_null[$i], $field_default[$i], isset($field_default_current_timestamp[$i]), $field_extra[$i], isset($field_comments[$i]) ? $field_comments[$i] : '', $field_primary, $i); if ($field_where != 'last') { // Only the first field can be added somewhere other than at the end