[BUGFIX] Add missing stdWrap to includeRecordsWithoutDefaultTranslation 70/38870/3
authorJo Hasenau <info@cybercraft.de>
Thu, 23 Apr 2015 10:15:50 +0000 (12:15 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Fri, 8 May 2015 06:15:04 +0000 (08:15 +0200)
Releases: master
Resolves: #57087
Change-Id: I83454c261dc4c23abcccb46661d8eb2dc3d56904
Reviewed-on: http://review.typo3.org/38870
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php

index ae5f621..fb317f8 100644 (file)
@@ -8076,7 +8076,10 @@ class ContentObjectRenderer {
                                $languageQuery = $conf['languageField'] . ' IN (0,-1)';
                                // Use this option to include records that don't have a default translation
                                // (originalpointerfield is 0 and the language field contains the requested language)
-                               if (!empty($conf['includeRecordsWithoutDefaultTranslation'])) {
+                               $includeRecordsWithoutDefaultTranslation = isset($conf['includeRecordsWithoutDefaultTranslation.']) ?
+                                       $this->stdWrap($conf['includeRecordsWithoutDefaultTranslation'], $conf['includeRecordsWithoutDefaultTranslation.']) :
+                                       $conf['includeRecordsWithoutDefaultTranslation'];
+                               if (!empty(trim($includeRecordsWithoutDefaultTranslation))) {
                                        $languageQuery .= ' OR (' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . ' = 0 AND ' .
                                                $conf['languageField'] . ' = ' . $sys_language_content . ')';
                                }