Merge branch 'QA_4_6'

Conflicts:
	po/ja.po

ChangeLog

@@ -42,6 +42,8 @@ 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'
+- issue #12760 Fix Notice regarding 'Undefined index: users'
 
 4.6.5 (2016-11-24)
 - issue        Remove potentionally license problematic sRGB profile

libraries/server_privileges.lib.php

@@ -560,6 +560,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']);
 
@@ -4171,7 +4175,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);
 
     if (isset($create_user_real)) {