From c56c5c6dc396b9cebbe480dde9e7130a81167b1a Mon Sep 17 00:00:00 2001
From: Markus Klein <klein.t3@reelworx.at>
Date: Tue, 18 Nov 2014 21:28:44 +0100
Subject: [PATCH] [BUGFIX] Fix PHP warning in shouldFieldBeOverlaid()
PageRepository::shouldFieldBeOverlaid now properly checks for array-typed
values when mergeIfNotBlank behaviour is requested.
Resolves: #60998
Releases: master, 6.2
Change-Id: I9b536d2261eea6325e0f74365a3a4c85e37b1241
Reviewed-on: http://review.typo3.org/34320
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>
---
typo3/sysext/frontend/Classes/Page/PageRepository.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index edd94c870ef2..5bfdbd7891d3 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -1373,11 +1373,11 @@ class PageRepository {
$checkValue = '';
}
- if (trim($checkValue) === '') {
+ if ($checkValue === array() || trim($checkValue) === '') {
$shouldFieldBeOverlaid = FALSE;
}
}
return $shouldFieldBeOverlaid;
}
-}
\ No newline at end of file
+}
--
GitLab