From 3aad7328678fcb4a251773cc006aed968638f73d Mon Sep 17 00:00:00 2001 From: Dave MacFarlane Date: Tue, 17 May 2022 14:53:27 -0400 Subject: [PATCH] More incorrectly merged conflict? --- php/libraries/UserPermissions.class.inc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/php/libraries/UserPermissions.class.inc b/php/libraries/UserPermissions.class.inc index 84cf1b8bbae..da4268b0df0 100644 --- a/php/libraries/UserPermissions.class.inc +++ b/php/libraries/UserPermissions.class.inc @@ -299,15 +299,6 @@ class UserPermissions p.moduleID FROM permissions p "; - //If not superuser, get the permissions that the user has - if (!$this->hasPermission('superuser')) { - $query .= "JOIN user_perm_rel up ON (p.permID=up.PermID) - LEFT JOIN permissions_category pc ON (pc.ID=p.categoryID) - LEFT JOIN modules m ON p.moduleID=m.ID - WHERE up.userID = :UID and m.Active='Y' - ORDER BY p.categoryID, m.Name, p.description"; - } - $results = $DB->pselect($query, ['UID' => $this->userID]); $modules = \Module::getActiveModulesIndexed($loris); // Build new meaningful description from combination of columns