Bug #15013 » bug_1537_v2.diff

Administrator Admin, 2008-04-04 00:04

View differences:

typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
483 483
		}
484 484

  
485 485
		if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
486
			$ss=$path.$GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
487
			$GLOBALS['TSFE']->content.='
488
	<link rel="SHORTCUT ICON" href="'.htmlspecialchars($ss).'" />';
486
			$favIcon = $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
487
			$favIcon = t3lib_div::getIndpEnv('TYPO3_SITE_URL').$favIcon;
488
			$iconMimeType = '';
489
			if (function_exists('finfo_open')) {
490
				$finfo = finfo_open(FILEINFO_MIME);
491
				$iconMimeType = ' type="'.finfo_file($finfo,$favIcon).'"';
492
				finfo_close($finfo);
493
			}
494

  
495
			$GLOBALS['TSFE']->content.= '
496
	<link rel="shortcut icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />
497
	<link rel="icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />';
489 498
		}
490 499

  
491 500
			// Including CSS files
(2-2/2)