Index: typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php
===================================================================
--- typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php (révision 6915)
+++ typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php (copie de travail)
@@ -2,7 +2,7 @@
/***************************************************************
* Copyright notice
*
-* (c) 2007-2009 Stanislas Rolland
+* (c) 2007-2010 Stanislas Rolland
* All rights reserved
*
* This script is part of the Typo3 project. The Typo3 project is
@@ -24,7 +24,7 @@
/**
* InlineElements plugin for htmlArea RTE
*
- * @author Stanislas Rolland
+ * @author Stanislas Rolland
*
* TYPO3 SVN ID: $Id$
*
@@ -161,8 +161,10 @@
$hideItems = t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList($this->thisConfig['buttons.']['formattext.']['removeItems']), 1);
}
// Restriction clause
- if ($this->thisConfig['buttons.']['formattext.']['restrictToItems']) {
- $restrictTo = t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList('none,'.$this->thisConfig['buttons.']['formattext.']['restrictTo']), 1);
+ if ($this->thisConfig['buttons.']['formattext.']['restrictTo']) {
+ $restrictTo = t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList('none,'.$this->thisConfig['buttons.']['formattext.']['restrictTo']), 1);
+ } else if ($this->thisConfig['buttons.']['formattext.']['restrictToItems']) {
+ $restrictTo = t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList('none,'.$this->thisConfig['buttons.']['formattext.']['restrictToItems']), 1);
}
// Elements order
if ($this->thisConfig['buttons.']['formattext.']['orderItems']) {