Fixes bug phpmyadmin#13968

Signed-off-by: Mattias Kågström <matkag@kth.se>
mattiaskagstrom · Apr 10, 2018 · 80bca69 · 80bca69 · phpmyadmin-bot · Apr 10, 2018
1 parent 9917c28
commit 80bca69
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
@@ -2078,11 +2078,13 @@ private function getSpecialCharsAndBackupFieldForInsertingMode(
             $special_chars = Util::convertBitDefaultValue(
                 $column['Default']
             );
-        } elseif (substr($trueType, 0, 9) == 'timestamp'
-            || $trueType == 'datetime'
+        }  elseif (substr($trueType, 0, 9) == 'timestamp'
+            || ($trueType == 'datetime' && $column['Default'] == null)
             || $trueType == 'time'
-        ) {
-            $special_chars = Util::addMicroseconds($column['Default']);
+        ) {            
+            $special_chars = Util::addMicroseconds($column['Default']);            
+        } elseif($trueType == 'datetime' && $column['Default'] != null){
+            $special_chars = date("Y-m-d h:i:s");
         } elseif ($trueType == 'binary' || $trueType == 'varbinary') {
             $special_chars = bin2hex($column['Default']);
         } else {