From ddc8e8c497ab9eef5d6b33e8a9a84f9e08915b2a Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 3 May 2018 12:36:38 +0000 Subject: [PATCH 1/4] Translated using Weblate (Hebrew) Currently translated at 38.2% (1259 of 3288 strings) [CI skip] --- po/he.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/he.po b/po/he.po index 81c0505914..2a6773c991 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-01 12:38+0000\n" +"PO-Revision-Date: 2018-05-03 16:42+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -1341,6 +1341,8 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log מופעל, אך בפועל מתבצע רישום לשאילתות שאורכות למעלה מ־%d " +"שניות. עדיף להגדיר את הערך long_query_time ל־0-2 שניות, בהתאם למערכת שלך." #: js/messages.php:233 #, php-format @@ -1796,7 +1798,7 @@ msgstr "האם למחוק את התוצאות עבור הטבלה %s?" #: js/messages.php:398 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "" +msgstr "הגדרה של פונקציה מאוחסנת חייבת להכיל משפט RETURN!" #: js/messages.php:399 libraries/classes/Config/Forms/User/ExportForm.php:140 #: libraries/classes/Display/Results.php:4701 @@ -1818,7 +1820,7 @@ msgstr "יצוא" #: js/messages.php:401 msgid "No routine is exportable. Required privileges may be lacking." -msgstr "" +msgstr "אין שגרה שניתן לייצא. יכול להיות שחסרות הרשאות." #: js/messages.php:404 libraries/classes/Rte/Routines.php:760 msgid "ENUM/SET editor" @@ -1908,7 +1910,7 @@ msgstr "משתנה %d:" #: js/messages.php:426 libraries/classes/Normalization.php:961 msgid "Pick" -msgstr "" +msgstr "בחירה" #: js/messages.php:427 msgid "Column selector" From 441321a123f47376c5de54756fd02008f7cacdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 3 May 2018 13:48:59 -0300 Subject: [PATCH 2/4] Add ChangeLog entry for #14128 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 123b14104e..5f6afe119b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #14241 Dropping indexes and foreign keys fail - issue #14227 Relational linking broken - issue #14246 Fixed error in configuration storage zero config +- issue #14128 Show 2FA Secret next to QR code 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02 From b02220241f39197e194ad1fc76a6d52b704a6bdb Mon Sep 17 00:00:00 2001 From: Piyush Vijay Date: Tue, 17 Apr 2018 14:15:09 +0530 Subject: [PATCH 3/4] XML Export from single table throws fatal error (PHP 7.2): #14212 issue fixed Signed-off-by: Piyush Vijay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5b35dba67df11fa9c296f9f9ba8edd3cf5048c08) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Plugins/Export/ExportXml.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php index 80731fb965..13ab94a0f0 100644 --- a/libraries/classes/Plugins/Export/ExportXml.php +++ b/libraries/classes/Plugins/Export/ExportXml.php @@ -53,7 +53,7 @@ class ExportXml extends ExportPlugin } /** - * Initialize the local variables that are used for export PDF + * Initialize the local variables that are used for export XML * * @return void */ @@ -61,7 +61,9 @@ class ExportXml extends ExportPlugin { global $table, $tables; $this->_setTable($table); - $this->_setTables($tables); + if (is_array($tables)) { + $this->_setTables($tables); + } } /** From ea1e3a2578e5fe7287b7001f6ff181811bdb79af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 4 May 2018 02:46:45 -0300 Subject: [PATCH 4/4] Add ChangeLog entry for #14212 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 5f6afe119b..71773c1719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - issue #14227 Relational linking broken - issue #14246 Fixed error in configuration storage zero config - issue #14128 Show 2FA Secret next to QR code +- issue #14212 XML Export from single table throws fatal error 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02