Merge branch 'QA_4_6'

karibu · Jan 6, 2017 · 6dbd423 · 6dbd423
2 parents 811c73b + 681e908
commit 6dbd423
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog
 - issue #12847 Fixed editing of virtual columns
 - issue #12859 Changed WHERE condition to 0 instead of 1 for SQL query window to avoid accidents
 - issue #12872 Use same query for display and execution when dropping index
+- issue #12868 Fix check for user groups freatures being enabled
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
@@ -561,7 +561,7 @@ function PMA_getHtmlToChooseUserGroup($username)
 function PMA_setUserGroup($username, $userGroup)
 {
     $cfgRelation = PMA_getRelationsParam();
-    if (! isset($cfgRelation['users']) || isset($cfgRelation['usergroups'])) {
+    if (empty($cfgRelation['db']) || empty($cfgRelation['users']) || empty($cfgRelation['usergroups'])) {
         return;
     }
 
@@ -2845,8 +2845,8 @@ function PMA_getUserGroupForUser($username)
 {
     $cfgRelation = PMA_getRelationsParam();
 
-    if (! isset($cfgRelation['db'])
-        || ! isset($cfgRelation['users'])
+    if (empty($cfgRelation['db'])
+        || empty($cfgRelation['users'])
     ) {
         return null;
     }
@@ -2935,7 +2935,7 @@ function PMA_getExtraDataForAjaxBehavior(
         // if $cfg['Servers'][$i]['users'] and $cfg['Servers'][$i]['usergroups'] are
         // enabled
         $cfgRelation = PMA_getRelationsParam();
-        if (isset($cfgRelation['users']) && isset($cfgRelation['usergroups'])) {
+        if (!empty($cfgRelation['users']) && !empty($cfgRelation['usergroups'])) {
             $new_user_string .= '<td class="usrGroup"></td>';
         }