Fixed bug #15355: htmlArea RTE: Using the advanded frontend editing, the editor is...
authorStanislas Rolland <typo3@sjbr.ca>
Fri, 6 Aug 2010 00:35:05 +0000 (00:35 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Fri, 6 Aug 2010 00:35:05 +0000 (00:35 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8503 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php

index c349ace..c1205f8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #15355: htmlArea RTE: Using the advanded frontend editing, the editor is not loaded in the text tab
+
 2010-08-05  Steffen Kamper  <steffen@typo3.org>
 
        * Fixed bug #12646: Click on icon does not open/close sections
index 956ada7..cb73e20 100644 (file)
@@ -1,3 +1,7 @@
+2010-08-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #15355: htmlArea RTE: Using the advanded frontend editing, the editor is not loaded in the text tab
+
 2010-07-27  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #15244: htmlArea RTE: textearea Id may not be unique in FE
index d25c900..910acca 100644 (file)
@@ -1146,7 +1146,10 @@ 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);
+                               if ($this->isFrontendEditActive()) {
+                                       $filename = preg_replace('/^..\//', '', $filename);
+                               }
                        } else {
                                $filename = t3lib_div::createVersionNumberedFilename(($this->isFrontendEditActive() ? '' : ($this->backPath . '../')) . $relativeFilename);
                        }