Index: typo3/sysext/cms/tslib/content/class.tslib_content_content.php =================================================================== --- typo3/sysext/cms/tslib/content/class.tslib_content_content.php (revision 9214) +++ typo3/sysext/cms/tslib/content/class.tslib_content_content.php (revision ) @@ -49,17 +49,22 @@ $GLOBALS['TSFE']->recordRegister[$originalRec]++; } - $conf['table'] = trim($this->cObj->stdWrap($conf['table'], $conf['table.'])); - if ($conf['table'] == 'pages' || substr($conf['table'], 0, 3) == 'tt_' || substr($conf['table'], 0, 3) == 'fe_' || substr($conf['table'], 0, 3) == 'tx_' || substr($conf['table'], 0, 4) == 'ttx_' || substr($conf['table'], 0, 5) == 'user_' || substr($conf['table'], 0, 7) == 'static_') { + $conf['table'] = isset($conf['table.']) ? trim($this->cObj->stdWrap($conf['table'], $conf['table.'])) : trim($conf['table']); + $tableFirstSubstring = t3lib_div::trimExplode('_',$conf['table']); + if ($tableFirstSubstring[0] == 'pages' || $tableSubstring == 'tt_' || $tableSubstring == 'fe_' || $tableSubstring == 'tx_' || substr($conf['table'], 0, 4) == 'ttx_' || substr($conf['table'], 0, 5) == 'user_' || substr($conf['table'], 0, 7) == 'static_') { $renderObjName = $conf['renderObj'] ? $conf['renderObj'] : '<' . $conf['table']; $renderObjKey = $conf['renderObj'] ? 'renderObj' : ''; $renderObjConf = $conf['renderObj.']; - $slide = intval($conf['slide']) ? intval($conf['slide']) : 0; - $slideCollect = intval($conf['slide.']['collect']) ? intval($conf['slide.']['collect']) : 0; - $slideCollectReverse = intval($conf['slide.']['collectReverse']) ? TRUE : FALSE; - $slideCollectFuzzy = $slideCollect ? (intval($conf['slide.']['collectFuzzy']) ? TRUE : FALSE) : TRUE; + $slide = isset($conf['slide.']) ? intval($this->cObj->stdWrap($conf['slide'], $conf['slide.'])) : intval($conf['slide']); + $slide = $slide ? $slide : 0; + $slideCollect = isset($conf['slide.']['collect.']) ? intval($this->cObj->stdWrap($conf['slide.']['collect'], $conf['slide.']['collect.'])) : intval($conf['slide.']['collect']); + $slideCollect = $slideCollect ? $slideCollect : 0; + $slideCollectReverse = isset($conf['slide.']['collectReverse.']) ? intval($this->cObj->stdWrap($conf['slide.']['collectReverse'], $conf['slide.']['collectReverse.'])) : intval($conf['slide.']['collectReverse']); + $slideCollectReverse = $slideCollectReverse ? TRUE : FALSE; + $slideCollectFuzzy = isset($conf['slide.']['collectFuzzy.']) ? intval($this->cObj->stdWrap($conf['slide.']['collectFuzzy'],$conf['slide.']['collectFuzzy.'])) : intval($conf['slide.']['collectFuzzy']); + $slideCollectFuzzy = $slideCollect ? ($slideCollectFuzzy ? TRUE : FALSE) : TRUE; $again = FALSE; do { @@ -114,10 +119,13 @@ } } while ($again && (($slide && !strlen($tmpValue) && $slideCollectFuzzy) || ($slide && $slideCollect))); } - - $theValue = $this->cObj->wrap($theValue, $conf['wrap']); - if ($conf['stdWrap.']) + $wrap = isset($conf['wrap.']) ? $this->cObj->stdWrap($conf['wrap'],$conf['wrap.']) : $conf['wrap']; + if($wrap) { + $theValue = $this->cObj->wrap($theValue, $wrap); + } + if (isset($conf['stdWrap.'])) { $theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']); + } $GLOBALS['TSFE']->currentRecord = $originalRec; // Restore return $theValue;