[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/34523
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers <xavier@typo3.org>

diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index 5ded340..c876d34 100644 (file)
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -1413,7 +1413,7 @@ class PageRepository {
                                $checkValue = '';
                        }
 
-                       if (trim($checkValue) === '') {
+                       if ($checkValue === array() || trim($checkValue) === '') {
                                $shouldFieldBeOverlaid = FALSE;
                        }
                }