introduced requested changes

magento · Jan 21, 2021 · f11d277 · f11d277
1 parent 2900e74
commit f11d277
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -164,10 +164,9 @@ private function getCurrentPage(): PageInterface
             return $this->pageFactory->create();
         }
         $this->dataPersistor->clear('cms_page');
-        $page = $this->pageFactory->create()
-            ->setData($data);
 
-        return $page;
+        return $this->pageFactory->create()
+            ->setData($data);
     }
 
     /**
@@ -217,17 +216,14 @@ public function getMeta()
         $page = null;
         try {
             $page = $this->pageRepository->getById($this->getPageId());
-        } catch (LocalizedException $e) {
-            $this->logger->error($e->getMessage());
-        }
-
-        if ($page) {
             if ($page->getCustomLayoutUpdateXml() || $page->getLayoutUpdateXml()) {
                 $options[] = ['label' => 'Use existing layout update XML', 'value' => '_existing_'];
             }
             foreach ($this->customLayoutManager->fetchAvailableFiles($page) as $layoutFile) {
                 $options[] = ['label' => $layoutFile, 'value' => $layoutFile];
             }
+        } catch (LocalizedException $e) {
+            $this->logger->error($e->getMessage());
         }
 
         $customLayoutMeta = [