Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-11-29 04:36:00 +01:00
commit 3990a6c311
2 changed files with 5 additions and 0 deletions

View File

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

View File

@ -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']);