* Fixed bug #1537: Shortcut icon syntax incorrect/incomplete
authorSebastian Kurfürst <sebastian.kurfuerst@typo3.org>
Thu, 3 Apr 2008 23:16:45 +0000 (23:16 +0000)
committerSebastian Kurfürst <sebastian.kurfuerst@typo3.org>
Thu, 3 Apr 2008 23:16:45 +0000 (23:16 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3528 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_pagegen.php

index 24ae1af..3d89ac0 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 
        * Fixed bug #7476: link in about module opens in the TYPO3 backend frameset (Thanks to Bodo Eichstädt / wmdb)
        * Fixed bug #7991: Workspace Preview is not aware of domain records
 
        * Fixed bug #7476: link in about module opens in the TYPO3 backend frameset (Thanks to Bodo Eichstädt / wmdb)
        * Fixed bug #7991: Workspace Preview is not aware of domain records
+       * Fixed bug #1537: Shortcut icon syntax incorrect/incomplete
 
 2008-04-02  Ingo Renner  <ingo@typo3.org>
 
 
 2008-04-02  Ingo Renner  <ingo@typo3.org>
 
index b4f76e8..de438d7 100755 (executable)
@@ -483,9 +483,17 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                }
 
                if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
                }
 
                if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
-                       $ss=$path.$GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
-                       $GLOBALS['TSFE']->content.='
-       <link rel="SHORTCUT ICON" href="'.htmlspecialchars($ss).'" />';
+                       $favIcon = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
+                       $iconMimeType = '';
+                       if (function_exists('finfo_open')) {
+                               $finfo = finfo_open(FILEINFO_MIME);
+                               $iconMimeType = ' type="'.finfo_file($finfo,$favIcon).'"';
+                               finfo_close($finfo);
+                       }
+
+                       $GLOBALS['TSFE']->content.= '
+       <link rel="shortcut icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />
+       <link rel="icon" href="'.htmlspecialchars($favIcon).'"'.$iconMimeType.' />';
                }
 
                        // Including CSS files
                }
 
                        // Including CSS files