diff --git a/ChangeLog b/ChangeLog index d4378830a604a7987f354d051dd60fff38c7f115..fe7ee0f0aa056a8ae02164f13fdbaf8d2fc90bed 100755 --- 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 a30e19b2477d88bb1b3696a45865fc6b36ad409b..9252cefcfe005c4382faae3d0318c3ad3b4ee667 100644 --- 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 d004497c186c8f1a76ad8133ae2bb8c85256ac14..1509dc272b1ef718e862351f67f5b207ebe4825b 100644 --- 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);