From 2483e2fab1954bb0a38b47089f3622ec332a49fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Tue, 9 Dec 2014 21:39:26 +0100 Subject: [PATCH 1/3] Translated using Weblate (Azerbaijani) Currently translated at 53.1% (1584 of 2978 strings) [CI skip] --- po/az.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/az.po b/po/az.po index 823f28f027..e8ceeaf53d 100644 --- a/po/az.po +++ b/po/az.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-05 10:04+0100\n" -"PO-Revision-Date: 2014-11-24 15:56+0200\n" -"Last-Translator: Huseyn \n" +"PO-Revision-Date: 2014-12-09 21:39+0200\n" +"Last-Translator: Sevdimali İsa \n" "Language-Team: Azerbaijani " "\n" "Language: az\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.1-dev\n" +"X-Generator: Weblate 2.1\n" #: changelog.php:36 license.php:28 #, php-format @@ -2265,7 +2265,7 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:481 msgid ", latest stable version:" -msgstr "" +msgstr ", son stabil versiya:" #: js/messages.php:482 msgid "up to date" @@ -13618,6 +13618,8 @@ msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." msgstr "" +"Git versiyasını istifadə edirsiniz, [kbd]git pull[/kbd] icra edin :-)[br]" +"TSon stabil versiya %s, %s tarixində yayınlandı." #: setup/lib/index.lib.php:175 msgid "No newer stable version is available" From 24e7bf07217ce1945793e95621df817522882517 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 10 Dec 2014 14:34:03 +0530 Subject: [PATCH 2/3] ChangeLog entry for bug #4632 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 0c601571e3..2fbf1aa8c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ 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 4.3.1.0 (2014-12-08) - bug #4609 'Show all' checkbox label is not clickable From f39a4e10cd4ad8f0ee383e7c931bcf82276d7217 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 10 Dec 2014 14:35:14 +0530 Subject: [PATCH 3/3] bug #4633 Wrong parameter in fetchValue Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/insert_edit.lib.php | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fbf1aa8c4..79018a33bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - 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 diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 0491fc783e..706d1c11cd 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -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); } /**