Fixed bug #12331: htmlArea RTE plugins may not be loaded for multiple RTEs
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 2 Nov 2009 23:23:43 +0000 (23:23 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 2 Nov 2009 23:23:43 +0000 (23:23 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6313 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 54ee71b..fabf9a8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-11-02  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #12439: htmlArea RTE: js error raised on paste by default word cleaning
+       * Fixed bug #12331: htmlArea RTE plugins may not be loaded for multiple RTEs
 
 2009-11-02  Oliver Hader  <oliver@typo3.org>
 
index ec2657e..93ab4aa 100644 (file)
@@ -1,6 +1,7 @@
 2009-11-02  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #12439: htmlArea RTE: js error raised on paste by default word cleaning
+       * Fixed bug #12331: htmlArea RTE plugins may not be loaded for multiple RTEs
 
 2009-10-27  Stanislas Rolland  <typo3@sjbr.ca>
 
index 9f37307..4968aa1 100644 (file)
@@ -341,9 +341,9 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
 
                                // Loading JavaScript files and code
                        if ($this->TCEform->RTEcounter == 1) {
-                               $this->TCEform->additionalCode_pre['rtehtmlarea-loadJSfiles'] = $this->loadJSfiles($this->TCEform->RTEcounter);
                                $this->TCEform->additionalJS_pre['rtehtmlarea-loadJScode'] = $this->loadJScode($this->TCEform->RTEcounter);
                        }
+                       $this->TCEform->additionalCode_pre['rtehtmlarea-loadJSfiles'] = $this->loadJSfiles($this->TCEform->RTEcounter);
 
                        /* =======================================
                         * DRAW THE EDITOR
index dc5abab..b220eb5 100644 (file)
@@ -222,9 +222,9 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                $this->addSkin();
                        // Loading JavaScript files and code
                if ($this->TCEform->RTEcounter == 1) {
-                       $this->TCEform->additionalJS_initial = $this->loadJSfiles($this->TCEform->RTEcounter);
                        $this->TCEform->additionalJS_pre['rtehtmlarea-loadJScode'] = $this->loadJScode($this->TCEform->RTEcounter);
                }
+               $this->TCEform->additionalJS_initial = $this->loadJSfiles($this->TCEform->RTEcounter);
 
                /* =======================================
                 * DRAW THE EDITOR