Fixed bug #14859: htmlArea RTE won't load in backend extension

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

diff --git a/ChangeLog b/ChangeLog
index d5ac514..a1ddef1 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
        * Fixed bug #15244: htmlArea RTE: textearea Id may not be unique in FE
        * Fixed bug #15250: htmlArea RTE: FE additionalJS_post javascript may be displayed as HTML text
        * Fixed bug #15121: htmlArea RTE: Javascript Error in IE7 prevent Link dialogue from opening
+       * Fixed bug #14859: htmlArea RTE won't load in backend extension
 
 2010-07-27  Xavier Perseguers  <typo3@perseguers.ch>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 8eaed06..956ada7 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -3,6 +3,7 @@
        * Fixed bug #15244: htmlArea RTE: textearea Id may not be unique in FE
        * Fixed bug #15250: htmlArea RTE: FE additionalJS_post javascript may be displayed as HTML text
        * Fixed bug #15121: htmlArea RTE: Javascript Error in IE7 prevent Link dialogue from opening
+       * Fixed bug #14859: htmlArea RTE won't load in backend extension
 
 2010-07-26  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
index 17ec06f..d25c900 100644 (file)
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -1106,14 +1106,11 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $this->cumulativeScripts[$this->TCEform->RTEcounter][] = $destination;
                }
                if ($this->is_FE()) {
-                       return ($GLOBALS['TSFE']->absRefPrefix ? $GLOBALS['TSFE']->absRefPrefix : '') . t3lib_div::createVersionNumberedFilename($relativeFilename);
+                       $filename =  ($GLOBALS['TSFE']->absRefPrefix ? $GLOBALS['TSFE']->absRefPrefix : '') . t3lib_div::createVersionNumberedFilename($relativeFilename);
                } else {
-                       $filename = t3lib_div::createVersionNumberedFilename(($this->isFrontendEditActive() ? '' : ('../' . $this->backPath)) . $relativeFilename);
-                       if ($this->isFrontendEditActive()) {
-                               $filename = preg_replace('/^..\//', '', $filename);
-                       }
-                       return $filename;
+                       $filename = t3lib_div::createVersionNumberedFilename(($this->isFrontendEditActive() ? '' : ($this->backPath . '../')) . $relativeFilename);
                }
+               return t3lib_div::resolveBackPath($filename);
        }
        /**
         * Concatenates all accumulated scripts in a file in typo3temp/rtehtmlarea directory and returns the file name
@@ -1149,15 +1146,12 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                } else {
                        if ($compress) {
                                $compressor = t3lib_div::makeInstance('t3lib_Compressor');
-                               $filename = $compressor->compressJsFile('../' . ($this->isFrontendEditActive() ? '' : $this->backPath) . $relativeFilename);
+                               $filename = $compressor->compressJsFile(($this->isFrontendEditActive() ? '' : ($this->backPath . '../')) . $relativeFilename);
                        } else {
-                               $filename = t3lib_div::createVersionNumberedFilename(($this->isFrontendEditActive() ? '' : ('../' . $this->backPath)) . $relativeFilename);
-                       }
-                       if ($this->isFrontendEditActive()) {
-                               $filename = preg_replace('/^..\//', '', $filename);
+                               $filename = t3lib_div::createVersionNumberedFilename(($this->isFrontendEditActive() ? '' : ($this->backPath . '../')) . $relativeFilename);
                        }
                }
-               return $filename;
+               return t3lib_div::resolveBackPath($filename);
        }
 
        /**
@@ -1310,14 +1304,14 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        list($extKey,$local) = explode('/',substr($filename,4),2);
                        $newFilename = '';
                        if (strcmp($extKey,'') &&  t3lib_extMgm::isLoaded($extKey) && strcmp($local,'')) {
-                               $newFilename = ($this->is_FE() ? t3lib_extMgm::siteRelPath($extKey) : $this->backPath . t3lib_extMgm::extRelPath($extKey)) . $local;
+                               $newFilename = (($this->is_FE() || $this->isFrontendEditActive()) ? t3lib_extMgm::siteRelPath($extKey) : $this->backPath . t3lib_extMgm::extRelPath($extKey)) . $local;
                        }
                } elseif (substr($filename,0,1) != '/') {
-                       $newFilename = (($this->is_FE() || $this->isFrontendEditActive()) ? '' : ('../' . $this->backPath)) . $filename;
+                       $newFilename = (($this->is_FE() || $this->isFrontendEditActive()) ? '' : ($this->backPath . '../')) . $filename;
                } else {
-                       $newFilename = (($this->is_FE() || $this->isFrontendEditActive()) ? '' : ('../' . $this->backPath)) . substr($filename, 1);
+                       $newFilename = (($this->is_FE() || $this->isFrontendEditActive()) ? '' : ($this->backPath . '../')) . substr($filename, 1);
                }
-               return  $newFilename;
+               return  t3lib_div::resolveBackPath($newFilename);
        }
 
        /**