typo3_9975.patch

Stefan Galinski, 2011-09-23 20:12

Download (1.5 KB)

View differences:

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

  
132
								$row = $GLOBALS['TSFE']->sys_page->getRecordOverlay($conf['table'], $row, $sys_language_overlayID, $GLOBALS['TSFE']->sys_language_contentOL);
123 133
							}
124 134
						}
125 135