From 9342cc6709ee9731315a19c12339294fb01d159f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 7 Jun 2014 09:02:10 -0400 Subject: [PATCH] Incorrect menu tab generation from usergroups Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/Menu.class.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6b04f4c3c4..2e518d5468 100644 --- a/ChangeLog +++ b/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 diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index cbf3dad8f8..581873860d 100644 --- a/libraries/Menu.class.php +++ b/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']) . "')";