Fixed issue #17555: htmlArea RTE: Delete deprecated Aspell-related extension configur...
authorStanislas Rolland <typo3@sjbr.ca>
Sat, 12 Feb 2011 00:00:20 +0000 (00:00 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sat, 12 Feb 2011 00:00:20 +0000 (00:00 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10450 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/ext_conf_template.txt
typo3/sysext/rtehtmlarea/ext_localconf.php
typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php

index 49c3306..000eb8a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed issue #17552: htmlArea RTE: Delete deprecated class HTMLArea.Dialog
        * Fixed issue #17554: htmlArea RTE: Delete deprecated DAM integration extension variable
+       * Fixed issue #17555: htmlArea RTE: Delete deprecated Aspell-related extension configuration variables
 
 2011-02-11  Christian Kuhn  <lolli@schwarzbu.ch>
 
index 04e29d7..903599d 100644 (file)
@@ -2,6 +2,7 @@
 
        * Fixed issue #17552: htmlArea RTE: Delete deprecated class HTMLArea.Dialog
        * Fixed issue #17554: htmlArea RTE: Delete deprecated DAM integration extension variable
+       * Fixed issue #17555: htmlArea RTE: Delete deprecated Aspell-related extension configuration variables
 
 2011-02-07  Stanislas Rolland  <typo3@sjbr.ca>
 
index 6c4fd19..dc51d1e 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 8a4cd0a..ae585d2 100644 (file)
@@ -10,12 +10,6 @@ noSpellCheckLanguages = ja,km,ko,lo,th,zh,b5,gb
   # cat=basic; type=string; label=Aspell path: The server path where Aspell is installed.
 AspellDirectory = /usr/bin/aspell
 
-  # cat=basic; type=string; label=Default Aspell dictionary: The default dictionary to be used by the htmlArea SpellChecker plugin. DEPRECATED. Use Page TSConfig properties defaultContentLanguage and buttons.spellcheck.dictionaries.[language-iso-code].defaultValue.
-defaultDictionary = en
-
-  # cat=basic; type=string; label=List of Aspell dictionaries: The list of dictionaries available to the htmlArea SpellChecker plugin. DEPRECATED. Use Page TSConfig properties buttons.spellcheck.dictionaries.items and restrictToItems.
-dictionaryList  = en
-
   # cat=basic/enable/100; type=options[Minimal (Most features disabled. Administrator needs to enable them using TypoScript. For advanced administrators only.),Typical (Most commonly used features are enabled. Select this option if you are unsure which one to use.),Demo (Show-off configuration. Includes pre-configured styles. Not for production environments.)]; label=Default configuration settings
 defaultConfiguration = Typical (Most commonly used features are enabled. Select this option if you are unsure which one to use.)
 
index 6ec24da..3e68f44 100644 (file)
@@ -208,9 +208,6 @@ $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['disableInFE']
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['AspellDirectory'] = $_EXTCONF['AspellDirectory'] ? $_EXTCONF['AspellDirectory'] : '/usr/bin/aspell';
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['noSpellCheckLanguages'] = $_EXTCONF['noSpellCheckLanguages'] ? $_EXTCONF['noSpellCheckLanguages'] : 'ja,km,ko,lo,th,zh,b5,gb';
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['forceCommandMode'] = $_EXTCONF['forceCommandMode'] ? $_EXTCONF['forceCommandMode'] : 0;
-       // The following two properties DEPRECATED as of TYPO3 4.3.0
-$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['dictionaryList'] = $_EXTCONF['dictionaryList'] ? $_EXTCONF['dictionaryList'] : 'en';
-$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['defaultDictionary'] = $_EXTCONF['defaultDictionary'] ? $_EXTCONF['defaultDictionary'] : 'en';
 
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace'] = array();
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/FindReplace/class.tx_rtehtmlarea_findreplace.php:&tx_rtehtmlarea_findreplace';
index 1ffef39..a7b3a14 100644 (file)
@@ -89,8 +89,6 @@ class tx_rtehtmlarea_pi1 {
                }
                if (empty($dictionaryList)) {
                        $dictionaryList = t3lib_div::_POST('showDictionaries');
-                               // Applying EM variable DEPRECATED as of TYPO3 4.3.0
-                       $dictionaryList = $dictionaryList ? $dictionaryList : trim($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->extKey]['plugins']['SpellChecker']['dictionaryList']);
                }
                $dictionaryArray = t3lib_div::trimExplode(',', $dictionaryList, 1);
                $restrictToDictionaries = t3lib_div::_POST('restrictToDictionaries');
@@ -101,8 +99,7 @@ class tx_rtehtmlarea_pi1 {
                        $dictionaryArray[] = 'en';
                }
                $this->dictionary = t3lib_div::_POST('dictionary');
-                       // Applying EM variable DEPRECATED as of TYPO3 4.3.0
-               $defaultDictionary = $this->dictionary ? $this->dictionary : trim($TYPO3_CONF_VARS['EXTCONF'][$this->extKey]['plugins']['SpellChecker']['defaultDictionary']);
+               $defaultDictionary = $this->dictionary;
                if (!$defaultDictionary || !in_array($defaultDictionary, $dictionaryArray)) {
                        $defaultDictionary = 'en';
                }