From 0fad7290c90f9b192aff4e4946b3276803946a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 19 Jul 2016 09:20:15 +0200 Subject: [PATCH 1/5] Escape database name in SQL query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/server_privileges.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 3e6faca30f..bed0a92d6f 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2384,7 +2384,7 @@ function PMA_getListOfPrivilegesAndComparedPrivileges() */ function PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $odd_row, $index_checkbox) { - $sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = "' . $db . '";'; + $sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = "' . Util::sqlAddSlashes($db) . '";'; $res = $GLOBALS['dbi']->query($sql_query); $html_output = ''; while ($row = $GLOBALS['dbi']->fetchAssoc($res)) { From 428604fcdd4094ffbb770a2bb15d8dad184a5a3d Mon Sep 17 00:00:00 2001 From: Kamyar Sec Date: Wed, 20 Jul 2016 07:25:28 +0000 Subject: [PATCH 2/5] Translated using Weblate (Kurdish Sorani) Currently translated at 18.0% (580 of 3208 strings) [CI skip] --- po/ckb.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index b3e7ff9734..39f4feea6c 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-05-23 14:30+0200\n" -"PO-Revision-Date: 2015-11-20 15:47+0000\n" -"Last-Translator: Dana Akram \n" -"Language-Team: Kurdish Sorani \n" +"PO-Revision-Date: 2016-07-20 07:25+0000\n" +"Last-Translator: Kamyar Sec \n" +"Language-Team: Kurdish Sorani " +"\n" "Language: ckb\n" "MIME-Version: 1.0\n" "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.5-dev\n" +"X-Generator: Weblate 2.8-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -34,7 +34,7 @@ msgstr "لیستەی بنەڕەتیی خانەکانی بنکەی دراوە ب #: db_central_columns.php:132 msgid "Click to sort." -msgstr "ڕیزکردن." +msgstr "کلیک بکه‌ بۆ پۆڵێن کردن." #: db_central_columns.php:151 #, php-format @@ -43,7 +43,7 @@ msgstr "پیشاندانی خانەکان %1$s - %2$s." #: db_datadict.php:58 libraries/operations.lib.php:36 msgid "Database comment" -msgstr "تێبینی بنکەی دراوە" +msgstr "تێبینی بنکەی دراو" #: db_datadict.php:105 libraries/plugins/schema/pdf/PdfRelationSchema.php:596 #: templates/columns_definitions/column_definitions_form.phtml:89 @@ -156,7 +156,7 @@ msgstr "بنەڕەت" #: libraries/plugins/schema/pdf/PdfRelationSchema.php:635 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:658 msgid "Links to" -msgstr "بەستەر دەکات بۆ" +msgstr "بەستەر بۆ" #: db_datadict.php:121 libraries/config/messages.inc.php:161 #: libraries/config/messages.inc.php:177 libraries/config/messages.inc.php:215 From 69c38579f634bf5bee9c48f329dc49f13df6b24e Mon Sep 17 00:00:00 2001 From: Kamyar Sec Date: Wed, 20 Jul 2016 07:25:32 +0000 Subject: [PATCH 3/5] Translated using Weblate (Kurdish Sorani) Currently translated at 18.1% (582 of 3209 strings) [CI skip] --- po/ckb.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ckb.po b/po/ckb.po index 99389af048..1e3e4affaf 100644 --- a/po/ckb.po +++ b/po/ckb.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-05-23 14:29+0200\n" -"PO-Revision-Date: 2015-11-20 15:47+0000\n" -"Last-Translator: Dana Akram \n" -"Language-Team: Kurdish Sorani \n" +"PO-Revision-Date: 2016-07-20 07:25+0000\n" +"Last-Translator: Kamyar Sec \n" +"Language-Team: Kurdish Sorani " +"\n" "Language: ckb\n" "MIME-Version: 1.0\n" "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.5-dev\n" +"X-Generator: Weblate 2.8-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -34,7 +34,7 @@ msgstr "لیستەی بنەڕەتیی خانەکانی بنکەی دراوە ب #: db_central_columns.php:130 msgid "Click to sort." -msgstr "ڕیزکردن." +msgstr "کلیک بکه‌ بۆ پۆڵێن کردن." #: db_central_columns.php:149 #, php-format @@ -43,7 +43,7 @@ msgstr "پیشاندانی خانەکان %1$s - %2$s." #: db_datadict.php:57 libraries/operations.lib.php:34 msgid "Database comment" -msgstr "تێبینی بنکەی دراوە" +msgstr "تێبینی بنکەی دراو" #: db_datadict.php:104 libraries/plugins/schema/pdf/PdfRelationSchema.php:596 #: templates/columns_definitions/column_definitions_form.phtml:88 @@ -150,7 +150,7 @@ msgstr "بنەڕەت" #: libraries/plugins/schema/pdf/PdfRelationSchema.php:635 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:658 msgid "Links to" -msgstr "بەستەر دەکات بۆ" +msgstr "بەستەر بۆ" #: db_datadict.php:120 libraries/config/messages.inc.php:161 #: libraries/config/messages.inc.php:177 libraries/config/messages.inc.php:215 From a32b3ceb6e74394cdea3e57dacd5070c0afad50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 19 Jul 2016 09:22:13 +0200 Subject: [PATCH 4/5] Use single quotes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/server_privileges.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index bed0a92d6f..6fa1a2f907 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2384,7 +2384,7 @@ function PMA_getListOfPrivilegesAndComparedPrivileges() */ function PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $odd_row, $index_checkbox) { - $sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = "' . Util::sqlAddSlashes($db) . '";'; + $sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = \'' . Util::sqlAddSlashes($db) . '\';'; $res = $GLOBALS['dbi']->query($sql_query); $html_output = ''; while ($row = $GLOBALS['dbi']->fetchAssoc($res)) { From bc6fbbe032d464000787de9af0c48ce8493095a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 22 Jul 2016 10:38:38 +0200 Subject: [PATCH 5/5] Update documentation copyright MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 686db58a4c..03c053f595 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -44,7 +44,7 @@ master_doc = 'index' # General information about the project. project = u'phpMyAdmin' -copyright = u'2012 - 2014, The phpMyAdmin devel team' +copyright = u'2012 - 2016, The phpMyAdmin devel team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the