Follow-up for issue #8799: htmlArea RTE: correction to two path settings

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

diff --git a/ChangeLog b/ChangeLog
index a76796b..dfbf9ff 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-08-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8988: htmlArea RTE: Pasting text from MS Word to Firefox 3 brings a lot of garbage
+       * Follow-up for issue #8799: htmlArea RTE: correction to two path settings
 
 2008-08-12  Dmitry Dulepov  <dmotry@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 2410af0..2a5fedf 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2008-08-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8988: htmlArea RTE: Pasting text from MS Word to Firefox 3 brings a lot of garbage
+       * Follow-up for issue #8799: htmlArea RTE: correction to two path settings
 
 2008-08-11  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php b/typo3/sysext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php
index 373a458..db2254a 100644 (file)
--- a/typo3/sysext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php
+++ b/typo3/sysext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php
@@ -37,7 +37,7 @@ class tx_rtehtmlarea_undoredo extends tx_rtehtmlareaapi {
        protected $extensionKey = 'rtehtmlarea';        // The key of the extension that is extending htmlArea RTE
        protected $pluginName = 'UndoRedo';             // The name of the plugin registered by the extension
        protected $relativePathToLocallangFile = '';    // Path to this main locallang file of the extension relative to the extension dir.
-       protected $relativePathToSkin = 'extensions/InlineElements/skin/htmlarea.css';          // Path to the skin (css) file relative to the extension dir.
+       protected $relativePathToSkin = 'extensions/UndoRedo/skin/htmlarea.css';                // Path to the skin (css) file relative to the extension dir.
        protected $htmlAreaRTE;                         // Reference to the invoking object
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
@@ -67,8 +67,8 @@ class tx_rtehtmlarea_undoredo extends tx_rtehtmlareaapi {
 
 } // end of class
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/ContextMenu/class.tx_rtehtmlarea_undoredo.php']) {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/ContextMenu/class.tx_rtehtmlarea_undoredo.php']);
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php']) {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php']);
 }
 
 ?>
\ No newline at end of file