Merge pull request #231 from magento-fearless-kiwis/FearlessKiwis-MAG…

…ETWO-55229-Problem-while-upgrading-210 [Fearless Kiwis] MAGETWO-55229: Problem while upgrading to 2.1.0
magento · Aug 9, 2016 · c107794 · c107794
2 parents bcdd65f + 80a7a65
commit c107794
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/code/Magento/Cms/Setup/UpgradeData.php b/app/code/Magento/Cms/Setup/UpgradeData.php
@@ -235,8 +235,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 </div>
 EOD;
             $privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);
-            $privacyAndCookiePolicyPage->setContent($newPageContent);
-            $privacyAndCookiePolicyPage->save();
+            $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
+            if ($privacyAndCookiePolicyPageId) {
+                $privacyAndCookiePolicyPage->setContent($newPageContent);
+                $privacyAndCookiePolicyPage->save();
+            }
         }
         $setup->endSetup();
     }