MAGETWO-48935: disable flags for category and product flat tables

Author: Dmytro Voskoboinikov

app/code/Magento/Catalog/Observer/AddCatalogToTopmenuItemsObserver.php

@@ -75,7 +75,7 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
             $categoryNode = new \Magento\Framework\Data\Tree\Node($categoryData, 'id', $tree, $parentCategoryNode);
             $parentCategoryNode->addChild($categoryNode);
 
-            if ($this->categoryFlatState->isFlatEnabled() && $category->getUseFlatResource()) {
+            if ($this->categoryFlatState->isAvailable() && $category->getUseFlatResource()) {
                 $subcategories = (array)$category->getChildrenNodes();
             } else {
                 $subcategories = $category->getChildren();

app/code/Magento/Catalog/Test/Unit/Observer/AddCatalogToTopmenuItemsObserverTest.php

@@ -54,7 +54,7 @@ public function setUp()
 
         $this->_categoryFlatState = $this->getMock(
             '\Magento\Catalog\Model\Indexer\Category\Flat\State',
-            ['isFlatEnabled'],
+            ['isAvailable'],
             [],
             '',
             false
@@ -168,7 +168,7 @@ public function testAddCatalogToTopMenuItemsWithFlat()
             ->will($this->returnValue(true));
 
         $this->_categoryFlatState->expects($this->once())
-            ->method('isFlatEnabled')
+            ->method('isAvailable')
             ->will($this->returnValue(true));
 
         $this->_observer->execute($observer);