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

ChangeLog

@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - bug #4437 Problems due to missing enforcement of the minimum supported MySQL version
 + Add enforcement of the minimum supported PHP version (5.3.0)
 - bug       Query error on submitting a column change form containing a disabled input field
+- bug       Incorrect menu tab generation from usergroups
 
 4.2.2.0 (2014-05-20)
 - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree

libraries/Menu.class.php

@@ -139,7 +139,9 @@ class PMA_Menu
                 . "." . PMA_Util::backquote($GLOBALS['cfg']['Server']['users']);
 
             $sql_query = "SELECT `tab` FROM " . $groupTable
-                . " WHERE `allowed` = 'N' AND `usergroup` = (SELECT usergroup FROM "
+                . " WHERE `allowed` = 'N'"
+                . " AND `tab` LIKE '" . $level . "%'"
+                . " AND `usergroup` = (SELECT usergroup FROM "
                 . $userTable . " WHERE `username` = '"
                 . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) . "')";