Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

This commit is contained in:
Weblate 2014-01-22 14:37:45 +01:00
commit 50912f3cbb
3 changed files with 4 additions and 4 deletions

View File

@ -6,6 +6,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

View File

@ -1181,16 +1181,15 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
);
$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(

View File

@ -1257,7 +1257,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
);