Merge branch '4.0' into 'main'

Author: thorsten

phpmyfaq/src/phpMyFAQ/Category/Order.php

@@ -130,23 +130,23 @@ public function getCategoryTree(array $categories, int $parentId = 0, array &$vi
             $categoryId = (int) $category['category_id'];
             $categoryParentId = (int) $category['parent_id'];
 
-            // First check if this category belongs at this level (parent_id matches)
-            if ($categoryParentId !== $parentId) {
+            // Skip if category is its own parent or creates a cycle
+            if ($categoryId === $categoryParentId) {
                 continue;
             }
 
-            // Then prevent infinite recursion by checking if we've already processed this category
-            // This check must come after the parent_id check to ensure we only mark categories
-            // as visited when they're actually being added to the tree at the correct level
-            if (isset($visited[$categoryId])) {
-                continue;
-            }
+            if ($categoryParentId === $parentId) {
+                // Check if this category has already been visited to prevent cycles
+                if (isset($visited[$categoryId])) {
+                    continue;
+                }
 
-            // Mark this category as visited
-            $visited[$categoryId] = true;
+                // Add the current category to a visited list
+                $visited[$categoryId] = true;
 
-            $childCategories = $this->getCategoryTree($categories, $categoryId, $visited);
-            $result[$categoryId] = $childCategories;
+                $childCategories = $this->getCategoryTree($categories, $categoryId, $visited);
+                $result[$categoryId] = $childCategories;
+            }
         }
 
         return $result;

phpmyfaq/src/phpMyFAQ/Enums/PermissionType.php

@@ -46,7 +46,7 @@ enum PermissionType: string
 
     case EXPORT = 'export';
 
-    case FAQ_ADD = 'addfaq';
+    case FAQ_ADD = 'add_faq';
 
     case FAQ_APPROVE = 'approverec';