Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
 - bug #4241 Confusing dialog when trying to create an already existing user
 - bug #4239 Missing LIMIT clause for some queries
 - rfe #1489 Do not show create icon when user has no privileges
+- bug #4218 Chrome behavior with date fields
 
 4.1.5.0 (2014-01-17)
 - bug #3780 Allow aborting loading pages

libraries/insert_edit.lib.php

@@ -1166,16 +1166,15 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
     $fieldsize, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex
 ) {
     $input_type = 'text';
+    // do not use the 'date' or 'time' types here; they have no effect on some
+    // browsers and create side effects (see bug #4218)
     $the_class = 'textfield';
     if ($column['pma_type'] === 'date') {
         $the_class .= ' datefield';
-        $input_type = 'date';
     } elseif ($column['pma_type'] === 'datetime'
         || substr($column['pma_type'], 0, 9) === 'timestamp'
     ) {
         $the_class .= ' datetimefield';
-    } elseif ($column['pma_type'] === 'time') {
-        $input_type = 'time';
     }
     $input_min_max = false;
     if (in_array(

test/libraries/PMA_insert_edit_test.php

@@ -1258,7 +1258,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $result = PMA_getHTMLinput($column, 'a', 'b', 30, 'c', 23, 2, 0);
 
         $this->assertEquals(
-            '<input type="date" name="fieldsa" value="b" size="30" class='
+            '<input type="text" name="fieldsa" value="b" size="30" class='
             . '"textfield datefield" c tabindex="25" id="field_0_3" />',
             $result
         );