Follow-up for feature #10416: htmlArea RTE: Add configuration options for the acronym...
authorStanislas Rolland <typo3@sjbr.ca>
Thu, 12 Feb 2009 22:45:35 +0000 (22:45 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Thu, 12 Feb 2009 22:45:35 +0000 (22:45 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5014 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php

index 1538d94..9e111dc 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-02-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10428: htmlArea RTE: Remove configuration variables related to Mozilla clipboard access
+       * Follow-up for feature #10416: htmlArea RTE: Add configuration options for the acronym feature
 
 2009-02-12  Dmitry Dulepov  <dmitry@typo3.org>
 
index 1a605fa..2224716 100644 (file)
@@ -1,6 +1,7 @@
 2009-02-12  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10428: htmlArea RTE: Remove configuration variables related to Mozilla clipboard access
+       * Follow-up for feature #10416: htmlArea RTE: Add configuration options for the acronym feature
 
 2009-02-11  Stanislas Rolland  <typo3@sjbr.ca>
 
index e9ff29d..d34a567 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 3b91d7d..ddcfb0e 100644 (file)
@@ -143,9 +143,9 @@ class tx_rtehtmlarea_acronym extends tx_rtehtmlareaapi {
                        }
                        $webMounts = $GLOBALS['BE_USER']->returnWebmounts();
                        $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-                       $depth = isset($this->thisConfig['buttons.'][$button.'.']['PIDList.']['depth']) ? intval($this->thisConfig['buttons.'][$button.'.']['PIDList.']['depth']) : 0 ;
-                       if (trim($this->thisConfig['buttons.'][$button.'.']['PIDList'])) {
-                               $pids = t3li_div::trimExplode(',', $this->thisConfig['buttons.'][$button.'.']['PIDList'], 1);
+                       $recursive = isset($this->thisConfig['buttons.'][$button.'.']['recursive']) ? intval($this->thisConfig['buttons.'][$button.'.']['recursive']) : 0 ;
+                       if (trim($this->thisConfig['buttons.'][$button.'.']['pages'])) {
+                               $pids = t3li_div::trimExplode(',', $this->thisConfig['buttons.'][$button.'.']['pages'], 1);
                                foreach ($pids as $key => $val) {
                                        if (!$GLOBALS['BE_USER']->isInWebMount($val, $perms_clause)) {
                                                unset($pids[$key]);
@@ -164,7 +164,7 @@ class tx_rtehtmlarea_acronym extends tx_rtehtmlareaapi {
                                if ($pageTree) {
                                        $pageTreePrefix = ',';
                                        }
-                               $pageTree .= $pageTreePrefix . $queryGenerator->getTreeList($val, $depth, $begin = 0, $perms_clause);
+                               $pageTree .= $pageTreePrefix . $queryGenerator->getTreeList($val, $recursive, $begin = 0, $perms_clause);
                        }
                        $whereClause .= ' AND '. $tableA . '.pid IN (' . $GLOBALS['TYPO3_DB']->fullQuoteStr(($pageTree ? $pageTree : ''), $tableA) . ')';
                }