From 1b1d68293b7cc3c06ddd6a60c2b0c29b3d9ae859 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 29 Nov 2016 08:53:00 +0530 Subject: [PATCH 1/5] Use proper check to verify if index is set in the Request Fix #12759 Signed-off-by: Deven Bansod --- 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 c328dd492a..208140de24 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -4355,7 +4355,7 @@ function PMA_addUser( // Copy the user group while copying a user $old_usergroup = - $_REQUEST['old_usergroup'] ? $_REQUEST['old_usergroup'] : null; + isset($_REQUEST['old_usergroup']) ? $_REQUEST['old_usergroup'] : null; PMA_setUserGroup($_REQUEST['username'], $old_usergroup); From b1e14110de7d2872569684c78c0a0e76ab14ff24 Mon Sep 17 00:00:00 2001 From: pralin Date: Tue, 29 Nov 2016 03:23:04 +0000 Subject: [PATCH 2/5] Translated using Weblate (Japanese) Currently translated at 70.7% (2280 of 3222 strings) [CI skip] --- po/ja.po | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0c163ed9b5..8cb794fc11 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:39+0100\n" -"PO-Revision-Date: 2016-09-21 06:46+0000\n" -"Last-Translator: yanagimoto \n" -"Language-Team: Japanese \n" +"PO-Revision-Date: 2016-11-29 03:23+0000\n" +"Last-Translator: pralin \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.10-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -592,16 +592,11 @@ msgid_plural "Import has been successfully finished, %d queries executed." msgstr[0] "インポートは正常に終了しました。%d 個のクエリを実行しました。" #: import.php:728 -#, fuzzy, php-format -#| msgid "" -#| "Script timeout passed, if you want to finish import, please resubmit same " -#| "file and import will resume." +#, php-format msgid "" "Script timeout passed, if you want to finish import, please %sresubmit the " "same file%s and import will resume." -msgstr "" -"スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファ" -"イルを再送信すればインポートが再開されます。" +msgstr "スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファイルを再送信すればインポートが再開されます。" #: import.php:738 msgid "" @@ -961,6 +956,7 @@ msgid "Are you sure you wish to change the collation and convert the data?" msgstr "照合順序を変更しデータを変換してもよろしいですか?" #: js/messages.php:93 +#, fuzzy msgid "" "Through this operation, MySQL attempts to map the data values between " "collations. If the character sets are incompatible, there may be data loss " @@ -969,6 +965,9 @@ msgid "" "column(s) editing feature (the \"Change\" Link) on the table structure page. " "" msgstr "" +"この操作によって、MySQLは照合順序間のデータ値の対応付けを試みます。文字セットに互換性がない場合データが欠落する可能性があり、欠落したデータは単にカラ" +"ムの照合順序を元に戻しただけでは復元されません。既存のデータの変換を行うには、テーブル構造ページのカラム編集機能（「変更」リンク）の使" +"用が推奨されます。" #: js/messages.php:102 msgid "" @@ -2159,26 +2158,26 @@ msgid "Outer ring" msgstr "アウターリング" #: js/messages.php:517 -#, fuzzy -#| msgid "Do you want to import remaining settings?" msgid "Do you want to copy encryption key?" msgstr "暗号化キーをコピーしますか？" #: js/messages.php:518 msgid "Encryption key" -msgstr "暗号化鍵" +msgstr "暗号化キー" #: js/messages.php:522 +#, fuzzy msgid "" "MySQL accepts additional values not selectable by the slider; key in those " "values directly if desired" -msgstr "" +msgstr "MySQLはスライダーで選択できない値を直接キー入力することもできます。" #: js/messages.php:528 +#, fuzzy msgid "" "MySQL accepts additional values not selectable by the datepicker; key in " "those values directly if desired" -msgstr "" +msgstr "MySQLは日付ピッカーで選択できない値を直接キー入力することもできます。" #: js/messages.php:534 msgid "" From 17e4e9e5c06baa5be5feae72a8d1d844e39f5f02 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 29 Nov 2016 08:54:44 +0530 Subject: [PATCH 3/5] ChangeLog for #12759 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index af4baff8e5..3e6dca4ca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - issue #12735 Incorrect parameters to escapeString in Node.php - issue #12734 Fix PHP error when mbstring is not installed - issue #12736 Don't force partition count to be specified when creating a new table +- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' 4.6.5 (2016-11-24) - issue Remove potentionally license problematic sRGB profile From 6baa646c74f041f3646017333eb86e414821f034 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 29 Nov 2016 09:04:32 +0530 Subject: [PATCH 4/5] Check if the cfgrelation tables are actually set before using them Fix #12760 Signed-off-by: Deven Bansod --- libraries/server_privileges.lib.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 208140de24..151ec9eddc 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -587,6 +587,10 @@ function PMA_getHtmlToChooseUserGroup($username) function PMA_setUserGroup($username, $userGroup) { $cfgRelation = PMA_getRelationsParam(); + if (! isset($cfgRelation['users']) || isset($cfgRelation['usergroups'])) { + return; + } + $userTable = Util::backquote($cfgRelation['db']) . "." . Util::backquote($cfgRelation['users']); From 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 29 Nov 2016 09:05:27 +0530 Subject: [PATCH 5/5] ChangeLog for #12760 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3e6dca4ca5..6d993d1e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #12734 Fix PHP error when mbstring is not installed - issue #12736 Don't force partition count to be specified when creating a new table - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' +- issue #12760 Fix Notice regarding 'Undefined index: users' 4.6.5 (2016-11-24) - issue Remove potentionally license problematic sRGB profile