More incorrectly merged conflict?

aces · May 17, 2022 · 4dd86a9 · 4dd86a9
1 parent 25688e0
commit 4dd86a9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/php/libraries/UserPermissions.class.inc b/php/libraries/UserPermissions.class.inc
@@ -306,9 +306,13 @@ class UserPermissions
                 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]);
+        } else {
+            $query  .= "LEFT JOIN permissions_category pc ON (pc.ID=p.categoryID)
+                LEFT JOIN modules m ON p.moduleID=m.ID WHERE m.Active='Y'
+                ORDER BY p.categoryID, m.Name, p.description";
+            $results = $DB->pselect($query, []);
         }
-
-        $results = $DB->pselect($query, ['UID' => $this->userID]);
         $modules = \Module::getActiveModulesIndexed($loris);
         // Build new meaningful description from combination of columns
         // Module Long Name: action description