Merge pull request #231 from magento-fearless-kiwis/FearlessKiwis-MAGETWO-55229-Problem-while-upgrading-210

Oleksii Korshenko · web-flow · commit c107794e1192 · 2016-08-09T11:45:36.000-05:00
[Fearless Kiwis] MAGETWO-55229: Problem while upgrading to 2.1.0
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();
     }

Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface`
`235`	`235`	`</div>`
`236`	`236`	`EOD;`
`237`	`237`	`$privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);`
`238`		`- $privacyAndCookiePolicyPage->setContent($newPageContent);`
`239`		`- $privacyAndCookiePolicyPage->save();`
	`238`	`+ $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();`
	`239`	`+ if ($privacyAndCookiePolicyPageId) {`
	`240`	`+ $privacyAndCookiePolicyPage->setContent($newPageContent);`
	`241`	`+ $privacyAndCookiePolicyPage->save();`
	`242`	`+ }`
`240`	`243`	`}`
`241`	`244`	`$setup->endSetup();`
`242`	`245`	`}`