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

…ETWO-56945-Problem-while-upgrading-210 Fixed issue: - MAGETWO-56945: Problem while upgrading to 2.1.0
magento · Aug 24, 2016 · d530867 · d530867
2 parents 403f363 + 37a9d0d
commit d530867
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();
     }