From 440e0ba2635f4331ba1f3f8d8970794e53026463 Mon Sep 17 00:00:00 2001
From: Frank Naegler <frank.naegler@typo3.org>
Date: Tue, 22 May 2018 09:22:52 +0200
Subject: [PATCH] [BUGFIX] Prevent PHP notice in TreeController
With #81987 we have introduced code, which could cause PHP notices.
This patch changes the check to prevent such notices.
Resolves: #85057
Related: #81987
Releases: master
Change-Id: I85e85501c2593b8abacac1d8296148d03d57f407
Reviewed-on: https://review.typo3.org/57019
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
---
typo3/sysext/backend/Classes/Controller/Page/TreeController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Classes/Controller/Page/TreeController.php b/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
index 6b0762c85127..f95eb9f49c58 100644
--- a/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
+++ b/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
@@ -356,7 +356,7 @@ class TreeController
$entryPointRootLine = $pageRepository->getRootLine($entryPoint);
foreach ($entryPointRootLine as $rootLineEntry) {
$parentUid = $rootLineEntry['uid'];
- if ($this->backgroundColors[$parentUid] !== null && $this->backgroundColors[$entryPoint] === null) {
+ if (!empty($this->backgroundColors[$parentUid]) && empty($this->backgroundColors[$entryPoint])) {
$this->backgroundColors[$entryPoint] = $this->backgroundColors[$parentUid];
}
}
--
GitLab