Merge remote-tracking branch 'troll/MAGETWO-47746' into MAGETWO-48042

magento · Jan 21, 2016 · fa80010 · fa80010
2 parents 03f436f + 349fd4b
commit fa80010
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -59,7 +59,16 @@ public function execute()
             if ($storeId) {
                 $categoryId = (int)$this->storeManager->getStore($storeId)->getRootCategoryId();
             } else {
-                $categoryId = (int)$this->storeManager->getDefaultStoreView()->getRootCategoryId();
+                $defaultStoreView = $this->storeManager->getDefaultStoreView();
+                if ($defaultStoreView) {
+                    $categoryId = (int)$defaultStoreView->getRootCategoryId();
+                } else {
+                    $stores = $this->storeManager->getStores();
+                    if (count($stores)) {
+                        $store = reset($stores);
+                        $categoryId = (int)$store->getRootCategoryId();
+                    }
+                }
             }
             $this->getRequest()->setParam('id', $categoryId);
         }