From a86c3e2a9f05fe8483214be100095c5ffc96d5a7 Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Sun, 19 Apr 2020 13:38:54 +0200
Subject: [PATCH] [BUGFIX] Add missing parentheses in ViewModule doktype check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Also simplify doktype check by using `in_array`
instead of comparing each doktype on its own.
Furthermore the check for the page row is superflous
because it is checked implicit by fetching the doktype.
Resolves: #91126
Releases: master
Change-Id: Ic9d39aacb4eaa663a03fcbff907a8d4c21fc5278
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64245
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Eßl <indy.essl@gmail.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Guido Schmechel <guido.schmechel@brandung.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Christian Eßl <indy.essl@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
---
.../Classes/Controller/ViewModuleController.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index 43abbb3ffb06..40c4094bc493 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -343,12 +343,14 @@ class ViewModuleController
}
$page = BackendUtility::getRecord('pages', $pageId);
- $pageType = (int)$page['doktype'] ?? 0;
-
- return $page !== null
- && $pageType !== PageRepository::DOKTYPE_SPACER
- && $pageType !== PageRepository::DOKTYPE_SYSFOLDER
- && $pageType !== PageRepository::DOKTYPE_RECYCLER;
+ $pageType = (int)($page['doktype'] ?? 0);
+
+ return $pageType !== 0
+ && !in_array($pageType, [
+ PageRepository::DOKTYPE_SPACER,
+ PageRepository::DOKTYPE_SYSFOLDER,
+ PageRepository::DOKTYPE_RECYCLER
+ ], true);
}
/**
--
GitLab