6009_dmitry.diff

Administrator Admin, 2011-03-10 15:35

Download (1.37 KB)

View differences:

typo3/sysext/cms/tslib/class.tslib_fe.php (working copy)
1690 1690
				} else {
1691 1691
					$message = 'You logged out from Workspace preview mode. Click this link to <a href="%1$s">go back to the website</a>';
1692 1692
				}
1693
				
1693

  
1694 1694
				$returnUrl = t3lib_div::sanitizeLocalUrl(t3lib_div::_GET('returnUrl'));
1695 1695
				die(sprintf($message,
1696 1696
					htmlspecialchars(preg_replace('/\&?ADMCMD_prev=[[:alnum:]]+/', '', $returnUrl))
......
2328 2328
							case 'content_fallback':
2329 2329
								$fallBackOrder = t3lib_div::intExplode(',', $sys_language_content);
2330 2330
								foreach($fallBackOrder as $orderValue)	{
2331
									if (!strcmp($orderValue,'0') || count($this->sys_page->getPageOverlay($this->id, $orderValue)))	{
2332
										$this->sys_language_content = $orderValue;	// Setting content uid (but leaving the sys_language_uid)
2333
										break;
2331
									if ($orderValue != '0') {
2332
										$newPageRow = $this->sys_page->getPageOverlay($this->page, $orderValue);
2333
										if (count($newPageRow) > 0)	{
2334
											$this->sys_language_content = $orderValue;
2335
											$this->sys_language_uid = $orderValue;
2336
											$this->page = $newPageRow;
2337
											break;
2338
										}
2334 2339
									}
2335 2340
								}
2336 2341
							break;