MC-18116: [Backport for 2.2.x] Email template preview bugfix

amolina-adobe · amolina-adobe · commit 4c55787db761 · 2019-07-31T10:23:06.000-05:00
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php
@@ -42,12 +42,12 @@ public function __construct(
      * Load the page defined in view/adminhtml/layout/adminhtml_email_template_popup.xml
      *
      * @return \Magento\Framework\View\Result\Page
-     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
         if (!$this->getRequest()->isPost()) {
-            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+            $this->_forward('noroute');
+            return;
         }
 
         return $this->resultPageFactory->create();

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ public function __construct(`
`42`	`42`	`* Load the page defined in view/adminhtml/layout/adminhtml_email_template_popup.xml`
`43`	`43`	`*`
`44`	`44`	`* @return \Magento\Framework\View\Result\Page`
`45`		`- * @throws \Magento\Framework\Exception\NotFoundException`
`46`	`45`	`*/`
`47`	`46`	`public function execute()`
`48`	`47`	`{`
`49`	`48`	`if (!$this->getRequest()->isPost()) {`
`50`		`- throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));`
	`49`	`+ $this->_forward('noroute');`
	`50`	`+ return;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return $this->resultPageFactory->create();`