Project

General

Profile

Bug #19718 » typo3_9975.patch

Stefan Galinski, 2011-09-23 20:12

View differences:

typo3_src/typo3/sysext/cms/tslib/content/class.tslib_content_content.php 2011-02-07 18:47:18.000000000 +0100
if ($conf['table'] == 'pages') {
$row = $GLOBALS['TSFE']->sys_page->getPageOverlay($row);
} else {
$row = $GLOBALS['TSFE']->sys_page->getRecordOverlay($conf['table'], $row, $GLOBALS['TSFE']->sys_language_content, $GLOBALS['TSFE']->sys_language_contentOL);
$sys_language_overlayID = $GLOBALS['TSFE']->sys_language_content;
// the page overlay must exist if the strict mode is enabled
if ($GLOBALS['TSFE']->sys_language_mode === 'content_fallback' && $row['pid'] != $GLOBALS['TSFE']->id) {
$overlayRecord = $GLOBALS['TSFE']->sys_page->getPageOverlay($row['pid'], $GLOBALS['TSFE']->sys_language_uid);
// check if a page overlay exists for the page which contains the current content element
if (count($overlayRecord)) {
$sys_language_overlayID = $GLOBALS['TSFE']->sys_language_uid;
}
}
$row = $GLOBALS['TSFE']->sys_page->getRecordOverlay($conf['table'], $row, $sys_language_overlayID, $GLOBALS['TSFE']->sys_language_contentOL);
}
}
(3-3/3)