Merge branch '2.0.5_backlog' of ssh://github.corp.magento.com/magento-sparta/magento2ce into MDVA-237

Author: isitnikov

app/code/Magento/Catalog/Controller/Category/View.php

@@ -172,13 +172,15 @@ public function execute()
             if ($settings->getPageLayout()) {
                 $page->getConfig()->setPageLayout($settings->getPageLayout());
             }
+
+            $hasChildren = $category->hasChildren();
             if ($category->getIsAnchor()) {
-                $type = $category->hasChildren() ? 'layered' : 'layered_without_children';
+                $type = $hasChildren ? 'layered' : 'layered_without_children';
             } else {
-                $type = $category->hasChildren() ? 'default' : 'default_without_children';
+                $type = $hasChildren ? 'default' : 'default_without_children';
             }
 
-            if (!$category->hasChildren()) {
+            if (!$hasChildren) {
                 // Two levels removed from parent.  Need to add default page type.
                 $parentType = strtok($type, '_');
                 $page->addPageLayoutHandles(['type' => $parentType]);

app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Category.php

@@ -112,13 +112,18 @@ public function getCategory()
             /** @var CategoryModel|null $category */
             $category = null;
             if ($this->categoryId !== null) {
-                $category = $this->categoryFactory->create()
-                    ->setStoreId(
-                        $this->getLayer()
-                            ->getCurrentStore()
-                            ->getId()
-                    )
-                    ->load($this->categoryId);
+                $currentCategory = $this->coreRegistry->registry('current_category');
+                if ($currentCategory !== null && $currentCategory->getId() == $this->categoryId) {
+                    $category = $currentCategory;
+                } else {
+                    $category = $this->categoryFactory->create()
+                        ->setStoreId(
+                            $this->getLayer()
+                                ->getCurrentStore()
+                                ->getId()
+                        )
+                        ->load($this->categoryId);
+                }
             }
 
             if ($category === null || !$category->getId()) {

lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php

@@ -12,6 +12,11 @@
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\View\Page\Config;
 
+/**
+ * @covers Magento\Framework\View\Page\Config
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**