Follow-up to feature #14014: htmlArea RTE should use version numbering method for...
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 10 May 2010 03:10:51 +0000 (03:10 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 10 May 2010 03:10:51 +0000 (03:10 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7569 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index d0fbe5b..f2e4a3f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-09  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to feature #14014: htmlArea RTE should use version numbering method for CSS and JS files
+
 2010-05-07  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed bug #14326: [Performance] Preload ExtJS in BE
index 6802601..1f34ebf 100644 (file)
@@ -1,3 +1,7 @@
+2010-05-09  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Follow-up to feature #14014: htmlArea RTE should use version numbering method for CSS and JS files
+
 2010-05-07  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14202: htmlArea RTE: Tables may get lost when using remove format feature
index 4de5f85..3db950d 100644 (file)
@@ -1107,7 +1107,11 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                if ($concatenate) {
                        $this->cumulativeScripts[$this->TCEform->RTEcounter][] = $destination;
                }
-               return (($this->is_FE() && $GLOBALS['TSFE']->absRefPrefix) ? $GLOBALS['TSFE']->absRefPrefix : '../' ) . t3lib_div::createVersionNumberedFilename($relativeFilename);
+               if ($this->is_FE()) {
+                       return ($GLOBALS['TSFE']->absRefPrefix ? $GLOBALS['TSFE']->absRefPrefix : '') . t3lib_div::createVersionNumberedFilename($relativeFilename);
+               } else {
+                       return t3lib_div::createVersionNumberedFilename('../' . $relativeFilename);
+               }
        }
        /**
         * Concatenates all accumulated scripts in a file in typo3temp/rtehtmlarea directory and returns the file name
@@ -1138,7 +1142,11 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                }
                        }
                }
-               return (($this->is_FE() && $GLOBALS['TSFE']->absRefPrefix) ? $GLOBALS['TSFE']->absRefPrefix : '../' ) . t3lib_div::createVersionNumberedFilename($relativeFilename);
+               if ($this->is_FE()) {
+                       return ($GLOBALS['TSFE']->absRefPrefix ? $GLOBALS['TSFE']->absRefPrefix : '') . t3lib_div::createVersionNumberedFilename($relativeFilename);
+               } else {
+                       return t3lib_div::createVersionNumberedFilename('../' . $relativeFilename);
+               }
        }
 
        /**