Fix incorrectly resolved rebase conflict

aces · May 17, 2022 · 25688e0 · 25688e0
1 parent feefd36
commit 25688e0
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/modules/user_accounts/php/edit_user.class.inc b/modules/user_accounts/php/edit_user.class.inc
@@ -935,16 +935,7 @@ class Edit_User extends \NDB_Form
                 = self::canRejectAccount(\User::factory($this->identifier));
         }
 
-        // get the editor's permissions
-        if ($editor->hasPermission('superuser')) {
-            $query = "SELECT p.permID, p.code, p.description, pc.Description as type
-            FROM permissions p
-                LEFT JOIN permissions_category pc ON (pc.ID=p.categoryID)
-                ORDER BY p.categoryID, p.description";
-            $perms = $factory->database()->pselect($query, []);
-        } else {
-            $perms = $editor->getPermissionsVerbose($this->lorisinstance);
-        }
+        $perms = $editor->getPermissionsVerbose($this->lorisinstance);
 
         $lastRole = '';
         $group    = [];