Allow TS config.absRefPrefix to work with resources in typo3conf/ext. Make it work...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3873 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 933fcab..a891767 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+
+2008-07-312  Martin Kutschker  <masi@typo3.org>
+
+       * Fixed bug #8864: Allow TS config.absRefPrefix to work with resources in typo3conf/ext. Make it work with a changed location of fileadmin/. (fix by Bejamin Mack)
+
 2008-07-11  Michael Stucki  <michael@typo3.org>
 
-       * Fixed bug 8941: Fixed an uninitialized array that might lead to PHP warning (Thanks to Ralf Hettinger)
+       * Fixed bug #8941: Fixed an uninitialized array that might lead to PHP warning (Thanks to Ralf Hettinger)
 
 2008-07-09  Oliver Hader  <oliver@typo3.org>
 

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 3b0adc6..cd2e269 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -4023,8 +4023,7 @@ if (version == "n3") {
        }
 
        /**
-        * Substitute the path's to files in the fileadmin/ and media/ folder like icons used in static_template of TypoScript
-        * Works on $this->content
+        * Converts relative paths in the HTML source to absolute paths for fileadmin/, typo3conf/ext/ and media/ folders.
         *
         * @return      void
         * @access private
@@ -4033,7 +4032,8 @@ if (version == "n3") {
        function setAbsRefPrefix()      {
                if ($this->absRefPrefix)        {
                        $this->content = str_replace('"media/', '"'.t3lib_extMgm::siteRelPath('cms').'tslib/media/', $this->content);
-                       $this->content = str_replace('"fileadmin/', '"'.$this->absRefPrefix.'fileadmin/', $this->content);
+                       $this->content = str_replace('"typo3conf/ext/', '"'.$this->absRefPrefix.'typo3conf/ext/', $this->content);
+                       $this->content = str_replace('"'.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '"'.$this->absRefPrefix.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], $this->content);
                }
        }
 
@@ -4589,4 +4589,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_fe.php']);
 }
 
-?>
\ No newline at end of file
+?>