gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-31 21:45:37 +01:00
commit 8e7e3a2fd5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/DisplayResults.class.php
View File

@ -4000,7 +4000,7 @@ class PMA_DisplayResults
} elseif (((substr($meta->type, 0, 9) == self::TIMESTAMP_FIELD)
|| ($meta->type == self::DATETIME_FIELD)
|| ($meta->type == self::TIME_FIELD)
|| ($meta->type == self::TIME_FIELD)) && (strpos ($column,"." ) === TRUE)
|| ($meta->type == self::TIME_FIELD)) && (strpos ($column, "." ) === TRUE)
) {
$column = PMA_Util::addMicroseconds($column);
}

8
libraries/insert_edit.lib.php
View File

@ -1168,7 +1168,7 @@ 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';
// verify True_Type which does not contain the parentheses and length
if ($column['True_Type'] === 'date') {
@ -1661,7 +1661,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
} elseif ((substr($column['True_Type'], 0, 9) == 'timestamp'
|| $column['True_Type'] == 'datetime'
|| $column['True_Type'] == 'time')
&& (strpos ($current_row[$column['Field']],"." ) === TRUE)
&& (strpos ($current_row[$column['Field']], "." ) === TRUE)
) {
$current_row[$column['Field']] = PMA_Util::addMicroseconds(
$current_row[$column['Field']]
@ -2806,11 +2806,11 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
$tabindex, $tabindex_for_null, $idindex, $vkey, $foreigners,
$foreignData
);
// The value column (depends on type)
// ----------------
// See bug #1667887 for the reason why we don't use the maxlength
// HTML attribute
// HTML attribute
//add data attributes "no of decimals" and "data type"
$no_decimals=0;