Fixed bug #13895: Bug: getTSConfigVal called with wrong object (Thanks to Andreas...

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

diff --git a/ChangeLog b/ChangeLog
index 9d93566..a6bf4d9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-06-12  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #13895: Bug: getTSConfigVal called with wrong object (Thanks to Andreas Stauder)
        * Fixed bug #14467: Code cleanup: t3lib_iconWorks::getIconImage is not needed anymore (Thanks to Steffen Ritter)
        * Fixed bug #14356: Make disable_controls available for all group fields, not just type "file" (Thanks to Sven Teuber)
 

diff --git a/t3lib/class.t3lib_tcemain.php b/t3lib/class.t3lib_tcemain.php
index 2a1840f..750d8b3 100644 (file)
--- a/t3lib/class.t3lib_tcemain.php
+++ b/t3lib/class.t3lib_tcemain.php
@@ -384,7 +384,7 @@ class t3lib_TCEmain {
                $this->username = $this->BE_USER->user['username'];
                $this->admin = $this->BE_USER->user['admin'];
 
-               if ($GLOBALS['BE_USER']->uc['recursiveDelete'])    {
+               if ($this->BE_USER->uc['recursiveDelete']) {
                        $this->deleteTree = 1;
                }
 
@@ -2623,7 +2623,7 @@ class t3lib_TCEmain       {
                                                                                }
                                                                        break;
                                                                        case 'swap':
-                                                                               $swapMode = $GLOBALS['BE_USER']->getTSConfigVal('options.workspaces.swapMode');
+                                                                               $swapMode = $this->BE_USER->getTSConfigVal('options.workspaces.swapMode');
                                                                                $elementList = array();
                                                                                if ($swapMode == 'any' || ($swapMode == 'page' && $table == 'pages')) {
                                                                                        // check if we are allowed to do synchronios publish. We must have a single element in the cmdmap to be allowed
@@ -2649,14 +2649,14 @@ class t3lib_TCEmain     {
                                                                        case 'setStage':
                                                                                $elementList = array();
                                                                                $idList = $elementList[$table] = t3lib_div::trimExplode(',',$id,1);
-                                                                               $setStageMode = $GLOBALS['BE_USER']->getTSConfigVal('options.workspaces.changeStageMode');
+                                                                               $setStageMode = $this->BE_USER->getTSConfigVal('options.workspaces.changeStageMode');
                                                                                if ($setStageMode == 'any' || $setStageMode == 'page') {
                                                                                        if (count($idList) == 1) {
                                                                                                $rec = t3lib_BEfunc::getRecord($table, $idList[0], 't3ver_wsid');
                                                                                                $workspaceId = $rec['t3ver_wsid'];
                                                                                        }
                                                                                        else {
-                                                                                               $workspaceId = $GLOBALS['BE_USER']->workspace;
+                                                                                               $workspaceId = $this->BE_USER->workspace;
                                                                                        }
                                                                                        if ($table !== 'pages') {
                                                                                                if ($setStageMode == 'any') {
@@ -4766,7 +4766,7 @@ class t3lib_TCEmain       {
                                                                                        // Write lock-file:
                                                                                t3lib_div::writeFileToTypo3tempDir($lockFileName,serialize(array(
                                                                                        'tstamp' => $GLOBALS['EXEC_TIME'],
-                                                                                       'user'=>$GLOBALS['BE_USER']->user['username'],
+                                                                                       'user'   => $this->BE_USER->user['username'],
                                                                                        'curVersion'=>$curVersion,
                                                                                        'swapVersion'=>$swapVersion
                                                                                )));