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

Merge branch 'master' into master-security

Browse Source
This commit is contained in:
Michal Čihař 2016-07-22 11:32:25 +02:00
commit 0b60b78e9d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/conf.py
View File

@ -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

2
libraries/server_privileges.lib.php
View File

@ -2374,7 +2374,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)) {

16
po/ckb.po
View File

@ -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 <dana@kurdish.one>\n"
"Language-Team: Kurdish Sorani <https://hosted.weblate.org/projects/"
"phpmyadmin/master/ckb/>\n"
"PO-Revision-Date: 2016-07-20 07:25+0000\n"
"Last-Translator: Kamyar Sec <kamofanar@gmail.com>\n"
"Language-Team: Kurdish Sorani "
"<https://hosted.weblate.org/projects/phpmyadmin/master/ckb/>\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