9975_v2.patch

Administrator Admin, 2009-02-14 13:37

Download (1.41 KB)

View differences:

typo3/sysext/cms/tslib/class.tslib_content.php (working copy)
1303 1303
						$GLOBALS['TSFE']->sys_page->versionOL($conf['table'],$row,TRUE);
1304 1304

  
1305 1305
							// Language Overlay:
1306
						$sys_language_overlayID = $GLOBALS['TSFE']->sys_language_content;
1307
						if ($slide && $GLOBALS['TSFE']->sys_language_mode === 'content_fallback' && $row['pid'] != $GLOBALS['TSFE']->id) { # the page overlay must exist if the strict mode is enabled
1308
							$overlayRecord = $GLOBALS['TSFE']->sys_page->getPageOverlay($row['pid'], $GLOBALS['TSFE']->sys_language_uid);
1309
							if (count($overlayRecord)) { # check if a page overlay exists for the page which contains the current content element
1310
								$sys_language_overlayID = $GLOBALS['TSFE']->sys_language_uid;
1311
							}
1312
						}
1313

  
1306 1314
						if (is_array($row) && $GLOBALS['TSFE']->sys_language_contentOL) {
1307
							$row = $GLOBALS['TSFE']->sys_page->getRecordOverlay($conf['table'],$row,$GLOBALS['TSFE']->sys_language_content,$GLOBALS['TSFE']->sys_language_contentOL);
1315
							$row = $GLOBALS['TSFE']->sys_page->getRecordOverlay($conf['table'], $row, $sys_language_overlayID, $GLOBALS['TSFE']->sys_language_contentOL);
1308 1316
						}
1309 1317

  
1310 1318
						if (is_array($row)) { // Might be unset in the sys_language_contentOL