From 853b2e769d9471bacc5f7537f116b863a642e925 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Wed, 2 Mar 2016 10:37:12 +0100
Subject: [PATCH] [BUGFIX] Incompatible declaration of
PreviewController::initializeView
The declaration of PreviewController::initializeView is changed to be
functional with PHP 7.
Change-Id: I4b59600aa3d98dec6440551f4228c9aad6fd6714
Resolves: #73866
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/46990
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Classes/Controller/PreviewController.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index b0d232b935b4..2680ca7844ad 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\BackendTemplateView;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
/**
* Implements the preview controller of the workspace module.
@@ -37,13 +38,16 @@ class PreviewController extends AbstractController
/**
* Set up the doc header properly here
*
- * @param BackendTemplateView $view
+ * @param ViewInterface $view
*/
- protected function initializeView(BackendTemplateView $view)
+ protected function initializeView(ViewInterface $view)
{
- parent::initializeView($view);
- $view->getModuleTemplate()->getDocHeaderComponent()->disable();
- $this->view->getModuleTemplate()->setFlashMessageQueue($this->controllerContext->getFlashMessageQueue());
+ if ($view instanceof BackendTemplateView) {
+ /** @var BackendTemplateView $view */
+ parent::initializeView($view);
+ $view->getModuleTemplate()->getDocHeaderComponent()->disable();
+ $this->view->getModuleTemplate()->setFlashMessageQueue($this->controllerContext->getFlashMessageQueue());
+ }
}
/**
--
GitLab