Merge branch 'MAGETWO-49400' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-43102

slopukhov · slopukhov · commit 244320abc0cb · 2016-02-17T19:05:45.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
@@ -1261,6 +1261,7 @@ public function toFlatArray()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Set parent category ID
      *
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -96,7 +96,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     protected $request;
 
-
     /**
      * @var Config
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -982,7 +982,6 @@ public function load($object, $entityId, $attributes = [])
          */
         $this->entityManager->load(CategoryInterface::class, $object, $entityId);
 
-
         if (!$this->entityManager->has(\Magento\Catalog\Api\Data\CategoryInterface::class, $entityId)) {
             $object->isObjectNew(true);
         }

Original file line number	Diff line number	Diff line change
`@@ -1261,6 +1261,7 @@ public function toFlatArray()`
`1261`	`1261`	`}`
`1262`	`1262`
`1263`	`1263`	`//@codeCoverageIgnoreStart`
	`1264`	`+`
`1264`	`1265`	`/**`
`1265`	`1266`	`* Set parent category ID`
`1266`	`1267`	`*`
Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,6 @@ public function load($object, $entityId, $attributes = [])`
`982`	`982`	`*/`
`983`	`983`	`$this->entityManager->load(CategoryInterface::class, $object, $entityId);`
`984`	`984`
`985`		`-`
`986`	`985`	`if (!$this->entityManager->has(\Magento\Catalog\Api\Data\CategoryInterface::class, $entityId)) {`
`987`	`986`	`$object->isObjectNew(true);`
`988`	`987`	`}`