Follow-up to #17289: resolved endless loop with login/logout
authorSteffen Kamper <info@sk-typo3.de>
Tue, 25 Jan 2011 11:53:49 +0000 (11:53 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 25 Jan 2011 11:53:49 +0000 (11:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10302 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/formprotection/class.t3lib_formprotection_backendformprotection.php

index 29fc25a..ea47c26 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2011-01-25  Steffen Kamper  <steffen@typo3.org>
 
 
 2011-01-25  Steffen Kamper  <steffen@typo3.org>
 
+       * Follow-up to #17289: resolved endless loop with login/logout
        * Fixed bug #17280: The FlashUploader does not disappear anymore
 
 2011-01-25  Ernesto Baschny  <ernst@cron-it.de>
        * Fixed bug #17280: The FlashUploader does not disappear anymore
 
 2011-01-25  Ernesto Baschny  <ernst@cron-it.de>
index 92a7d4d..49c5010 100644 (file)
@@ -182,9 +182,11 @@ class t3lib_formprotection_BackendFormProtection extends t3lib_formprotection_Ab
         *
         */
        protected function updateTokens() {
         *
         */
        protected function updateTokens() {
-               $this->backendUser->user = $this->backendUser->fetchUserSession(TRUE);
-               $tokens = $this->retrieveTokens();
-               $this->tokens = array_merge($this->tokens, $tokens);
+               if ($this->backendUser->user) {
+                       $this->backendUser->user = $this->backendUser->fetchUserSession(TRUE);
+                       $tokens = $this->retrieveTokens();
+                       $this->tokens = array_merge($this->tokens, $tokens);
+               }
        }
 
        /**
        }
 
        /**