messed up commit

Author: Rus0

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\Catalog\Model\Category;
 use Magento\CatalogGraphQl\Model\Resolver\Category\CheckCategoryIsActive;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ExtractDataFromCategoryTree;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -66,8 +67,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryId = isset($args['id']) ? (int)$args['id'] :
             (int)$context->getExtensionAttributes()->getStore()->getRootCategoryId();
-        $this->checkCategoryIsActive->execute($rootCategoryId);
 
+        if ($rootCategoryId !== Category::TREE_ROOT_ID) {
+            $this->checkCategoryIsActive->execute($rootCategoryId);
+        }
         $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
 
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

@@ -140,9 +140,6 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
             if ($node->kind === 'InlineFragment') {
                 continue;
             }
-            if ($node->kind === 'FragmentSpread') {
-                continue;
-            }
 
             $this->joinAttributesRecursively($collection, $node);
         }