Fixed bug #12013: tslib_pagegen fails to read mime type of the shortcut icon (thanks...
authorSteffen Kamper <info@sk-typo3.de>
Sat, 7 Nov 2009 15:06:20 +0000 (15:06 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sat, 7 Nov 2009 15:06:20 +0000 (15:06 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6370 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 58577ff..ee73880 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-11-07  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #12013: tslib_pagegen fails to read mime type of the shortcut icon (thanks to Xavier Perseguers)
        * Fixed bug #12503: Help extensions shouldn't be shy
 
 2009-11-07  Oliver Hader  <oliver@typo3.org>
index 3c86546..c7e2303 100644 (file)
@@ -481,16 +481,16 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                }
 
                if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
-                       $favIcon = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
+                       $favIcon = $GLOBALS['TSFE']->tmpl->getFileName($GLOBALS['TSFE']->pSetup['shortcutIcon']);
                        $iconMimeType = '';
                        if (function_exists('finfo_open')) {
                                if (($finfo = @finfo_open(FILEINFO_MIME))) {
-                                       $iconMimeType = ' type="' . finfo_file($finfo, $favIcon) . '"';
+                                       $iconMimeType = ' type="' . finfo_file($finfo, PATH_site . $favIcon) . '"';
                                        finfo_close($finfo);
                                        $pageRenderer->setIconMimeType($iconMimeType);
                                }
                        }
-                       $pageRenderer->setFavIcon($favIcon);
+                       $pageRenderer->setFavIcon(t3lib_div::getIndpEnv('TYPO3_SITE_URL') . $favIcon);
 
                }