Fixed bug #10610: htmlArea RTE: Two errors in class.tx_rtehtmlarea_acronym.php (Thank...

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

diff --git a/ChangeLog b/ChangeLog
index e1c0b41..e0469fc 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-06  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10610: htmlArea RTE: Two errors in class.tx_rtehtmlarea_acronym.php (Thanks to Ursula Renziehausen).
+
 2009-03-05  Benjamin Mack  <benni@typo3.org>
 
        * Fixed #10600: Cleaned up sysext usersetup module code (part 1) and the table method in template.php

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index f0e3814..149f06e 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-06  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10610: htmlArea RTE: Two errors in class.tx_rtehtmlarea_acronym.php (Thanks to Ursula Renziehausen).
+
 2009-02-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #10547: htmlARea RTE: tx_rtehtmlarea_clearrtecache::clearTempDir should use resolveBackPath

diff --git a/typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php b/typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php
index ddcfb0e..2490683 100644 (file)
--- a/typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php
+++ b/typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php
@@ -132,9 +132,9 @@ class tx_rtehtmlarea_acronym extends tx_rtehtmlareaapi {
                $tableAB = $tableA . ' LEFT JOIN ' . $tableB . ' ON ' . $tableA . '.static_lang_isocode=' . $tableB . '.uid';
                $whereClause = '1=1';
                        // Get all acronyms on pages to which the user has access
-               $lockBeUserToDBmounts = isset($this->thisConfig['buttons.'][$button.'.']['lockBeUserToDBmounts']) ? isset($this->thisConfig['buttons.'][$button.'.']['lockBeUserToDBmounts']) : $GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'];
+               $lockBeUserToDBmounts = isset($this->thisConfig['buttons.'][$button.'.']['lockBeUserToDBmounts']) ? $this->thisConfig['buttons.'][$button.'.']['lockBeUserToDBmounts'] : $GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'];
                if (!$GLOBALS['BE_USER']->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'] && $lockBeUserToDBmounts) {
-                               // Temporarily setting alternative web browsing mounts
+                // Temporarily setting alternative web browsing mounts
                        $altMountPoints = trim($GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.altElementBrowserMountPoints'));
                        if ($altMountPoints) {
                                $savedGroupDataWebmounts = $GLOBALS['BE_USER']->groupData['webmounts'];
@@ -145,7 +145,7 @@ class tx_rtehtmlarea_acronym extends tx_rtehtmlareaapi {
                        $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(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);
+                               $pids = t3lib_div::trimExplode(',', $this->thisConfig['buttons.'][$button.'.']['pages'], 1);
                                foreach ($pids as $key => $val) {
                                        if (!$GLOBALS['BE_USER']->isInWebMount($val, $perms_clause)) {
                                                unset($pids[$key]);