From: Goran Medakovic <avion.bg@gmail.com>
Date: Tue, 7 Oct 2014 16:38:17 +0000 (+0200)
Subject: [BUGFIX] Fix PHP warning with CTYPE=media
X-Git-Tag: 7.0.0~523
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/357c5dcb31664f7512dd9f5f5eec717553adb6ad

[BUGFIX] Fix PHP warning with CTYPE=media

Check for array type before checking the variable with isset().
If the variable is a string the isset() will cause a PHP warning.

Resolves: #59544
Releases: master, 6.2
Change-Id: I766292a3dc0365a40acff5fd5f089f7ea78e0b70
Reviewed-on: http://review.typo3.org/33191
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---

diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 5c36af4dee3f..2397ff5a537d 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1176,7 +1176,7 @@ class ContentObjectRenderer {
 		if ($recursive === FALSE && is_string($flexData)) {
 			$flexData = GeneralUtility::xml2array($flexData, 'T3');
 		}
-		if (isset($flexData['data']['sDEF']['lDEF'])) {
+		if (is_array($flexData) && isset($flexData['data']['sDEF']['lDEF'])) {
 			$flexData = $flexData['data']['sDEF']['lDEF'];
 		}
 		if (!is_array($flexData)) {