Fixed bug #14681: Use self:: for static method calls with classname:: within the...
authorSteffen Kamper <info@sk-typo3.de>
Sun, 13 Jun 2010 23:06:57 +0000 (23:06 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sun, 13 Jun 2010 23:06:57 +0000 (23:06 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7910 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_parsehtml.php
t3lib/class.t3lib_spritemanager.php
t3lib/utility/class.t3lib_utility_http.php

index 21f8756..e008257 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-06-13  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #14681: Use self:: for static method calls with classname:: within the same class in t3lib (Thanks to Sebastian Michaelsen)
        * Fixed bug #14538: Icons missing in page tree for "Page contains" pages (Thanks to Steffen Ritter)
 
 2010-06-13  Xavier Perseguers  <typo3@perseguers.ch>
index c71fc2c..c7f1215 100644 (file)
@@ -181,7 +181,7 @@ class t3lib_parsehtml       {
                $between = substr($content, $startAM, $stop-$startAM);
 
                if ($recursive) {
-                       $after = t3lib_parsehtml::substituteSubpart(
+                       $after = self::substituteSubpart(
                                $after,
                                $marker,
                                $subpartContent,
@@ -250,7 +250,7 @@ class t3lib_parsehtml       {
         */
        public static function substituteSubpartArray($content, array $subpartsContent) {
                foreach ($subpartsContent as $subpartMarker => $subpartContent) {
-                       $content = t3lib_parsehtml::substituteSubpart(
+                       $content = self::substituteSubpart(
                                $content,
                                $subpartMarker,
                                $subpartContent
index fb31a51..1b4fc53 100644 (file)
@@ -67,11 +67,11 @@ class t3lib_SpriteManager {
         */
        function __construct($regenerate = TRUE) {
                        // we check for existance of our targetDirectory
-               if (!is_dir(PATH_site . t3lib_SpriteManager::$tempPath)) {
-                       t3lib_div::mkdir(PATH_site . t3lib_SpriteManager::$tempPath);
+               if (!is_dir(PATH_site . self::$tempPath)) {
+                       t3lib_div::mkdir(PATH_site . self::$tempPath);
                }
                        // create a fileName, the hash includes all icons and css-styles registered and the extlist
-               $this->tempFileName = PATH_site . t3lib_SpriteManager::$tempPath .
+               $this->tempFileName = PATH_site . self::$tempPath .
                                                        md5(serialize($GLOBALS['TBE_STYLES']['spritemanager']) .
                                                        $GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']) . '.inc';
                        // if no cache-file for the current config ist present, regenerate it
@@ -95,7 +95,7 @@ class t3lib_SpriteManager {
                                $this->rebuildCache();
                        } else {
                                        // use old file if present
-                               list($this->tempFileName) = t3lib_div::getFilesInDir(PATH_site . t3lib_SpriteManager::$tempPath, 'inc', 1);
+                               list($this->tempFileName) = t3lib_div::getFilesInDir(PATH_site . self::$tempPath, 'inc', 1);
                        }
                }
        }
@@ -130,7 +130,7 @@ class t3lib_SpriteManager {
                $fileContent = '<?php $GLOBALS[\'TBE_STYLES\'][\'spriteIconApi\'][\'iconsAvailable\'] = unserialize(stripslashes(\'' . $cacheString . '\')); ?>';
 
                        // delete old cache files
-               $oldFiles = t3lib_div::getFilesInDir(PATH_site . t3lib_SpriteManager::$tempPath, 'inc', 1);
+               $oldFiles = t3lib_div::getFilesInDir(PATH_site . self::$tempPath, 'inc', 1);
                foreach ($oldFiles as $file) {
                        @unlink($file);
                }
index 7ad1d21..5dd99ee 100644 (file)
@@ -87,7 +87,7 @@ class t3lib_utility_Http {
         * @param       string  The target URL to redirect to
         * @param       string  An optional HTTP status header. Default is 'HTTP/1.1 303 See Other'
         */
-       public static function redirect($url, $httpStatus = t3lib_utility_Http::HTTP_STATUS_303) {
+       public static function redirect($url, $httpStatus = self::HTTP_STATUS_303) {
                header($httpStatus);
                header('Location: ' . t3lib_div::locationHeaderUrl($url));