* Fixed bug #7857 (revisited): htmlArea RTE: hidePStyleItems does not work anymore

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

diff --git a/ChangeLog b/ChangeLog
index d437883..fe7ee0f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 
        * Fixed bug #7857: htmlArea RTE: hidePStyleItems does not work anymore
        * Fixed bug #7867: htmlArea RTE undo/redo does not restore caret position
+       * Fixed bug #7857 (revisited): htmlArea RTE: hidePStyleItems does not work anymore
 
 2008-03-14  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index a30e19b..9252cef 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #7857: htmlArea RTE: hidePStyleItems does not work anymore
        * Fixed bug #7867: htmlArea RTE undo/redo does not restore caret position
+       * Fixed bug #7857 (revisited): htmlArea RTE: hidePStyleItems does not work anymore
 
 2008-03-14  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php b/typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
index d004497..1509dc2 100644 (file)
--- a/typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
+++ b/typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
@@ -107,22 +107,22 @@ class tx_rtehtmlarea_blockelements extends tx_rtehtmlareaapi {
                        if (is_array($this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.']['formatblock.'])) {
                                        // Removing elements
                                if ($this->thisConfig['buttons.']['formatblock.']['removeItems']) {
-                                       $hideItems =  t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList(strtolower($this->thisConfig['buttons.']['formatblock.']['removeItems'])), 1);
+                                       $hideItems =  t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList(t3lib_div::strtolower($this->thisConfig['buttons.']['formatblock.']['removeItems'])), 1);
                                }
                                        // Restriction clause
                                if ($this->thisConfig['buttons.']['formatblock.']['restrictToItems']) {
-                                       $restrictTo =  t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList('none,'.strtolower($this->thisConfig['buttons.']['formatblock.']['restrictTo'])), 1);
+                                       $restrictTo =  t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList('none,'.t3lib_div::strtolower($this->thisConfig['buttons.']['formatblock.']['restrictTo'])), 1);
                                }
                                        // Elements order
                                if ($this->thisConfig['buttons.']['formatblock.']['orderItems']) {
-                                       $blockElementsOrder = 'none,'.strtolower($this->thisConfig['buttons.']['formatblock.']['orderItems']);
+                                       $blockElementsOrder = 'none,'.t3lib_div::strtolower($this->thisConfig['buttons.']['formatblock.']['orderItems']);
                                }
                                $prefixLabelWithTag = ($this->thisConfig['buttons.']['formatblock.']['prefixLabelWithTag']) ? true : $prefixLabelWithTag;
                                $postfixLabelWithTag = ($this->thisConfig['buttons.']['formatblock.']['postfixLabelWithTag']) ? true : $postfixLabelWithTag;
                        }
                                // Processing old style configuration for hiding paragraphs
                        if ($this->thisConfig['hidePStyleItems']) {
-                               $hideItems = array_merge($hideItems, t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList(strtolower($this->thisConfig['hidePStyleItems'])), 1));
+                               $hideItems = array_merge($hideItems, t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList(t3lib_div::strtolower($this->thisConfig['hidePStyleItems'])), 1));
                        }
                                // Applying User TSConfig restriction
                        $blockElementsOrder = array_diff(t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList($blockElementsOrder), 1), $hideItems);