diff --git a/ChangeLog b/ChangeLog index d1f49d4d2f..105e2d8f28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4753 Normal field and multi-line field have different margins - bug #4760 Cannot re-import settings from local storage - bug #4778 SQL error when database list is sorted by additional columns +- bug #4780 Notice when timestamp column does not have default value 4.3.10.0 (2015-02-20) - bug Undefined index navwork diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 4560ceffdc..40eaf0f567 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -3701,7 +3701,8 @@ class PMA_Util && empty($field['Default']) && empty($data) && ! isset($analyzed_sql_field_array['on_update_current_timestamp']) - && ($analyzed_sql_field_array['default_value'] != 'NULL') + && ! (isset($analyzed_sql_field_array['default_value']) + && $analyzed_sql_field_array['default_value'] == 'NULL') ) { $default_function = $cfg['DefaultFunctions']['first_timestamp']; }