From f99aa697847a778670aac5a08a5f0c496fbabc44 Mon Sep 17 00:00:00 2001 From: Jozef Pistej Date: Mon, 26 Sep 2016 18:21:13 +0000 Subject: [PATCH 1/5] Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] --- po/sk.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/sk.po b/po/sk.po index a0f4908228..452a90a4be 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-09-07 11:45+0000\n" -"Last-Translator: Martin Lacina \n" +"PO-Revision-Date: 2016-09-26 18:21+0000\n" +"Last-Translator: Jozef Pistej \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.8\n" +"X-Generator: Weblate 2.9-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -3632,7 +3632,7 @@ msgstr "Neznáma chyba pri nahrávaní súboru." #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "Súbor je symbolická linka" #: libraries/File.php:470 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." @@ -4589,7 +4589,7 @@ msgstr "Statická analýza:" #: libraries/Util.php:691 #, php-format msgid "%d errors were found during analysis." -msgstr "" +msgstr "Počas analýzy bolo nájdených %d chýb." #: libraries/Util.php:754 libraries/rte/rte_events.lib.php:113 #: libraries/rte/rte_events.lib.php:122 libraries/rte/rte_events.lib.php:153 From 59cd9bf3a1b6cf292e4d3700301d7d0328977e8d Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 28 Sep 2016 19:23:12 +0530 Subject: [PATCH 2/5] Replace FROM clause aliases only if FROM clause is present Fix #12579 Signed-off-by: Deven Bansod --- tbl_export.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 8c703f0197..542dfd9c84 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -67,13 +67,15 @@ if (! empty($sql_query)) { } // Rebuilding the SELECT and FROM clauses. - $replaces = array( - array( - 'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build( - $parser->statements[0]->from + if (count($parser->statements[0]->from) > 0) { + $replaces = array( + array( + 'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build( + $parser->statements[0]->from + ), ), - ), - ); + ); + } // Checking if the WHERE clause has to be replaced. if ((!empty($where_clause)) && (is_array($where_clause))) { From 7084608fff35fd24f1ba7265fd2de408d8e7408b Mon Sep 17 00:00:00 2001 From: Jozef Pistej Date: Mon, 26 Sep 2016 18:21:13 +0000 Subject: [PATCH 3/5] Translated using Weblate (Slovak) Currently translated at 83.6% (2682 of 3206 strings) [CI skip] --- po/sk.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/sk.po b/po/sk.po index a0f4908228..452a90a4be 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-09-07 11:45+0000\n" -"Last-Translator: Martin Lacina \n" +"PO-Revision-Date: 2016-09-26 18:21+0000\n" +"Last-Translator: Jozef Pistej \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.8\n" +"X-Generator: Weblate 2.9-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -3632,7 +3632,7 @@ msgstr "Neznáma chyba pri nahrávaní súboru." #: libraries/File.php:424 msgid "File is a symbolic link" -msgstr "" +msgstr "Súbor je symbolická linka" #: libraries/File.php:470 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]." @@ -4589,7 +4589,7 @@ msgstr "Statická analýza:" #: libraries/Util.php:691 #, php-format msgid "%d errors were found during analysis." -msgstr "" +msgstr "Počas analýzy bolo nájdených %d chýb." #: libraries/Util.php:754 libraries/rte/rte_events.lib.php:113 #: libraries/rte/rte_events.lib.php:122 libraries/rte/rte_events.lib.php:153 From 7a80af393ddfc1eebd13a42745193b608180afdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 27 Sep 2016 09:23:06 +0200 Subject: [PATCH 4/5] Add missing escaping in sample regexp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12594 Signed-off-by: Michal Čihař --- doc/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/config.rst b/doc/config.rst index 9ea10df8f4..36c1b974d9 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1558,7 +1558,7 @@ Cookie authentication options $cfg['ArbitraryServerRegexp'] = '/^(server|another|yetdifferent)$/'; // Allow connection to range of IP addresses: - $cfg['ArbitraryServerRegexp'] = '@^192.168.0.[0-9]{1,}$@'; + $cfg['ArbitraryServerRegexp'] = '@^192\.168\.0\.[0-9]{1,}$@'; // Allow connection to server name ending with -mysql: $cfg['ArbitraryServerRegexp'] = '@^[^:]\-mysql$@'; From f54f8fa322eb3b1e894c24e0fa14383fe853ddc0 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 28 Sep 2016 20:07:44 +0530 Subject: [PATCH 5/5] ChangeLog for #12579 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d97a1f67a9..9fab505888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog - issue #12511 Clarify documentation on ArbitraryServerRegexp - issue #12508 Remove duplicate code in SQL escaping - issue #12475 Cleanup code for getting table information +- issue #12579 phpMyAdmin's export of a Select statment without a FROM clause generates Wrong SQL 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29