From 1e891017d1c9330a29c5b3766b405e085e4031e1 Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@magento.com>
Date: Tue, 5 Apr 2016 18:32:45 +0300
Subject: [PATCH] MAGETWO-50676: EntityManager introduction

---
 app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php      | 2 +-
 .../Framework/EntityManager/Observer/AfterEntitySave.php       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
index 66e5d05f9ee..c703658461c 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
@@ -149,7 +149,7 @@ class Page extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
         }
 
         if ($isId) {
-            $this->entityManager->load(PageInterface::class, $object, $value);
+            $this->entityManager->load($object, $value, PageInterface::class);
         }
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
index da9ae0e7ddf..9ca4a894739 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
@@ -27,6 +27,9 @@ class AfterEntitySave implements ObserverInterface
     {
         $entity = $observer->getEvent()->getEntity();
         if ($entity instanceof AbstractModel) {
+            if (method_exists($entity->getResource(), 'loadAllAttributes')) {
+                $entity->getResource()->loadAllAttributes();
+            }
             $entity->getResource()->afterSave($entity);
             $entity->afterSave();
             $entity->getResource()->addCommitCallback([$entity, 'afterCommitCallback']);
-- 
GitLab