Fixed bug #13985: bugfix/code cleanup: wrong image dimension returned if alternative...
authorSteffen Kamper <info@sk-typo3.de>
Sun, 11 Apr 2010 12:25:05 +0000 (12:25 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sun, 11 Apr 2010 12:25:05 +0000 (12:25 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7285 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/classes/class.typo3logo.php

index b20e5c7..d0361b7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-04-10  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #13985: bugfix/code cleanup: wrong image dimension returned if alternative logo is set and skin-extension is installed in global-space (backend-redesign) (thanks to Stephan N Kellermayr)
        * Update #14063: Updated ExtJs library from 3.1.1 to 3.2 Final
 
 2010-04-10  Steffen Kamper  <info@sk-typo3.de>
index 4a99255..42bcbef 100644 (file)
@@ -64,17 +64,14 @@ class TYPO3Logo {
 
 
                $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="'.$GLOBALS['TBE_TEMPLATE']->thisBlur().'">'.
-                               '<img'.t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]).' title="TYPO3 Content Management Framework" alt="" />'.
+                               '<img'.t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]).' title="TYPO3 Content Management System" alt="" />'.
                                '</a>';
 
                        // overwrite with custom logo
                if($GLOBALS['TBE_STYLES']['logo'])      {
-                       if(substr($GLOBALS['TBE_STYLES']['logo'], 0, 3) == '../')       {
-                               $imgInfo = @getimagesize(PATH_site.substr($GLOBALS['TBE_STYLES']['logo'], 3));
-                       }
-
-                       $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="'.$GLOBALS['TBE_TEMPLATE']->thisBlur().'">'.
-                               '<img src="'.$GLOBALS['TBE_STYLES']['logo'].'" '.$imgInfo[3].' title="TYPO3 Content Management Framework" alt="" />'.
+                       $imgInfo = @getimagesize(t3lib_div::resolveBackPath(PATH_typo3 . $GLOBALS['TBE_STYLES']['logo'], 3));
+                       $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="' . $GLOBALS['TBE_TEMPLATE']->thisBlur() . '">' .
+                               '<img src="' . $GLOBALS['TBE_STYLES']['logo'] . '" ' . $imgInfo[3] . ' title="TYPO3 Content Management System" alt="" />' .
                                '</a>';
                }