Merge branch '3.1' into 5.2

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / lib / data / article / category / ArticleCategory.class.php

diff --git a/wcfsetup/install/files/lib/data/article/category/ArticleCategory.class.php b/wcfsetup/install/files/lib/data/article/category/ArticleCategory.class.php
index 8d9860f340ff9307d5e1a4e08fc7b917a23abfb4..ddc459f30659f981cf1c4652eebb8bc85e1360e4 100644 (file)
--- a/wcfsetup/install/files/lib/data/article/category/ArticleCategory.class.php
+++ b/wcfsetup/install/files/lib/data/article/category/ArticleCategory.class.php
@@ -58,6 +58,8 @@ class ArticleCategory extends AbstractDecoratedCategory implements IAccessibleOb
        public function isAccessible(User $user = null) {
                if ($this->getObjectType()->objectType != self::OBJECT_TYPE_NAME) return false;
                
+               if ($this->isDisabled) return false;
+               
                // check permissions
                return $this->getPermission('canReadArticle', $user);
        }
@@ -118,14 +120,17 @@ class ArticleCategory extends AbstractDecoratedCategory implements IAccessibleOb
        public static function getAccessibleCategoryIDs(array $permissions = ['canReadArticle']) {
                $categoryIDs = [];
                foreach (CategoryHandler::getInstance()->getCategories(self::OBJECT_TYPE_NAME) as $category) {
-                       $result = true;
                        $category = new ArticleCategory($category);
-                       foreach ($permissions as $permission) {
-                               $result = $result && $category->getPermission($permission);
-                       }
                        
-                       if ($result) {
-                               $categoryIDs[] = $category->categoryID;
+                       if (!$category->isDisabled) {
+                               $result = true;
+                               foreach ($permissions as $permission) {
+                                       $result = $result && $category->getPermission($permission);
+                               }
+                               
+                               if ($result) {
+                                       $categoryIDs[] = $category->categoryID;
+                               }
                        }
                }