Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Chanaka Indrajith 2014-05-17 18:40:01 +05:30
commit 4b92e65d01
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -983,7 +983,9 @@ EOT;
$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>';