Merge branch 'QA_4_2'

phpmyadmin · May 17, 2014 · 5574368 · 5574368
2 parents 77a0d39 + 2986cdc
commit 5574368
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 - bug #4395 BLOB link transformation is broken
 - bug       Respect ['ShowCreateDb'] in the navi panel
 - bug #4392 Cannot see databases in nav panel on databases grouping when disabled database expansion
+- bug #4419 No more calendar into search tab
 
 4.2.1.0 (2014-05-13)
 - bug #4380 Cannot display table structure with enums containing special characters

diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -983,7 +983,9 @@ private function _getRowsNormal()
             $html_output .= '<td>' . $properties['type'] . '</td>';
             $html_output .= '<td>' . $properties['collation'] . '</td>';
             $html_output .= '<td>' . $properties['func'] . '</td>';
-            $html_output .= '<td>' . $properties['value'] . '</td>';
+            // here, the data-type attribute is needed for a date/time picker
+            $html_output .= '<td data-type="' . $properties['type'] . '"'
+                . '>' . $properties['value'] . '</td>';
             $html_output .= '</tr>';
             //Displays hidden fields
             $html_output .= '<tr><td>';