Bug #15013 » 1537.diff

Administrator Admin, 2007-05-19 16:42

View differences:

typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy)
478 478
<!-- '.($customContent?$customContent.chr(10):'').'
479 479
	This website is powered by TYPO3 - inspiring people to share!
480 480
	TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
481
	TYPO3 is copyright 1998-2006 of Kasper Skaarhoj. Extensions are copyright of their respective owners.
481
	TYPO3 is copyright 1998-2007 of Kasper Skaarhoj. Extensions are copyright of their respective owners.
482 482
	Information and contribution at http://typo3.com/ and http://typo3.org/
483 483
-->
484 484
';
......
489 489
	<base href="'.htmlspecialchars($GLOBALS['TSFE']->baseUrl).'" />';
490 490
		}
491 491

  
492
		if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
493
			$ss=$path.$GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
492
		if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
493
			$favIcon = $path.$GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
494
			
495
			$iconMimeType = '';
496
			if (function_exists('mime_content_type')) {
497
				$iconMimeType = ' type="'.mime_content_type($favIcon).'"';
498
			}
499
			
494 500
			$GLOBALS['TSFE']->content.='
495
	<link rel="SHORTCUT ICON" href="'.htmlspecialchars($ss).'" />';
501
	<link rel="shortcut icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />
502
	<link rel="icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />';
496 503
		}
497 504

  
498 505
			// Including CSS files
(1-1/2)