Fixed bug #12252: htmlArea RTE: errors are raised when extension rtehtmlarea_definiti...

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

diff --git a/ChangeLog b/ChangeLog
index e3ba677..284cd1a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-27  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #12252: htmlArea RTE: errors are raised when extension rtehtmlarea_definitionlist is installed with TYPO3 4.3
+
 2009-10-27  Steffen Kamper  <info@sk-typo3.de>
 
        * Updated wpplayer to version 2.0beta6

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 0f98c6e..f4fc7e4 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-27  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #12252: htmlArea RTE: errors are raised when extension rtehtmlarea_definitionlist is installed with TYPO3 4.3
+
 2009-09-15  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #11915: htmlArea RTE: superfluous span tags in content after server-based cleaning on paste operation

diff --git a/typo3/sysext/rtehtmlarea/ext_localconf.php b/typo3/sysext/rtehtmlarea/ext_localconf.php
index 2552fdd..7667222 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ext_localconf.php
+++ b/typo3/sysext/rtehtmlarea/ext_localconf.php
@@ -111,7 +111,7 @@ if ($_EXTCONF['enableInlineElements']) {
        t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/extensions/InlineElements/res/pageTSConfig.txt">');
 }
        // Block Elements configuration
-       // Set compatibility warnings in the Update Wizard of the Install Tool
+       // Set compatibility warnings in the Update Wizard of the Install Tool for indentation and alignment
 $TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_rtehtmlarea_indent'] = array(
        'title' => 'htmlArea RTE: Using CSS classes for indentation and alignment',
        'version' => 4002000,
@@ -127,6 +127,14 @@ if (!t3lib_div::compat_version('4.2.0')) {
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements'] = array();
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php:&tx_rtehtmlarea_blockelements';
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements']['addIconsToSkin'] = 0;
+       // Set compatibility warning in the Update Wizard of the Install Tool for definition lists
+if (t3lib_extMgm::isLoaded('rtehtmlarea_definitionlist')) {
+       $TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_rtehtmlarea_definitionlist'] = array(
+               'title' => 'htmlArea RTE: Integration of Definition List feature',
+               'version' => 4003000,
+               'description' => 'Support for definition lists has been integrated into htmlArea RTE.<br />You should uninstall extension "Definition Lists for htmlArea RTE" (key: rtehtmlarea_definitionlist)'
+       );
+}
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList'] = array();
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefinitionList/class.tx_rtehtmlarea_definitionlist.php:&tx_rtehtmlarea_definitionlist';
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList']['addIconsToSkin'] = 0;