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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-10 14:41:22 +05:30
commit 76342ae1bf
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -12,6 +12,8 @@ phpMyAdmin - ChangeLog
- bug #4631 Server selector submits two server parameter values
- bug #4629 Problem with custom SQL queries using cookie authentication
- bug Undefined index central_columnswork
- bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query
- bug #4633 Wrong parameter in fetchValue
4.3.1.0 (2014-12-08)
- bug #4609 'Show all' checkbox label is not clickable

11
libraries/insert_edit.lib.php
View File

@ -2367,7 +2367,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
$db, $table, $column_name, &$extra_data
) {
$extra_data['isNeedToRecheck'] = true;
$extra_data['isNeedToRecheck'] = false;
$sql_for_real_value = 'SELECT ' . PMA_Util::backquote($table) . '.'
. PMA_Util::backquote($column_name)
@ -2378,19 +2378,18 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
$result = $GLOBALS['dbi']->tryQuery($sql_for_real_value);
$fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
$meta = $fields_meta[0];
$new_value = $GLOBALS['dbi']->fetchValue($result);
if ($new_value !== false) {
if ($row = $GLOBALS['dbi']->fetchRow($result)) {
$new_value = $row[0];
if ((substr($meta->type, 0, 9) == 'timestamp')
|| ($meta->type == 'datetime')
|| ($meta->type == 'time')
) {
$new_value = PMA_Util::addMicroseconds($new_value);
}
$extra_data['isNeedToRecheck'] = true;
$extra_data['truncatableFieldValue'] = $new_value;
} else {
$extra_data['isNeedToRecheck'] = false;
}
$GLOBALS['dbi']->freeResult($result);
}
/**