[TASK] Remove XCLASS definitions from typo3/

[Packages/TYPO3.CMS.git] / typo3 / classes / class.typo3logo.php

diff --git a/typo3/classes/class.typo3logo.php b/typo3/classes/class.typo3logo.php
index 1d10e54..eef7ad8 100644 (file)
--- a/typo3/classes/class.typo3logo.php
+++ b/typo3/classes/class.typo3logo.php
@@ -43,7 +43,7 @@ class TYPO3Logo {
         * @return void
         */
        public function __construct() {
-               $this->logo = null;
+               $this->logo = NULL;
        }
 
        /**
@@ -61,14 +61,14 @@ class TYPO3Logo {
                $imgInfo = getimagesize(PATH_site . TYPO3_mainDir . $logoFile);
 
 
-               $logo = '<a href="http://www.typo3.com/" target="_blank">'.
-                               '<img'.t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]).' title="TYPO3 Content Management System" alt="" />'.
+               $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
+                               '<img' . t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]) . ' title="TYPO3 Content Management System" alt="" />' .
                                '</a>';
 
                        // overwrite with custom logo
                if($GLOBALS['TBE_STYLES']['logo'])      {
                        $imgInfo = @getimagesize(t3lib_div::resolveBackPath(PATH_typo3 . $GLOBALS['TBE_STYLES']['logo'], 3));
-                       $logo = '<a href="http://www.typo3.com/" target="_blank">' .
+                       $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
                                '<img src="' . $GLOBALS['TBE_STYLES']['logo'] . '" ' . $imgInfo[3] . ' title="TYPO3 Content Management System" alt="" />' .
                                '</a>';
                }
@@ -88,12 +88,5 @@ class TYPO3Logo {
 
                $this->logo = $logo;
        }
-
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3logo.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/classes/class.typo3logo.php']);
-}
-
 ?>
\ No newline at end of file