Merge branch 'QA_4_6'

2016-10-13 14:11:28 +05:30 · 2016-10-13 14:11:28 +05:30 · fc4ee9a9e4
commit fc4ee9a9e4
parent 4f3b22b00a 900a12f870
1 changed files with 7 additions and 0 deletions
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@ -2970,6 +2970,13 @@ function PMA_getUserGroupCount()
 function PMA_getUserGroupForUser($username)
 {
    $cfgRelation = PMA_getRelationsParam();
+
+    if (! isset($cfgRelation['db'])
+        || ! isset($cfgRelation['users'])
+    ) {
+        return null;
+    }
+
    $user_table = Util::backquote($cfgRelation['db'])
        . '.' . Util::backquote($cfgRelation['users']);
    $sql_query = 'SELECT `usergroup` FROM ' . $user_table