From d840107832b1f59a9fc3b93ffb97ef976be1b83c Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Thu, 17 Nov 2011 16:52:56 +0000
Subject: 3-in-1 bugfix commit: 1) TErrorHandler: avoid an error when trying to
 hide the file path of a lambda function 2) TSecurityManager: avoid a race
 condition when first generating the encryptionkey or the validationkey 3)
 TActiveFileUpload: urlencode the base64'ed token since it can contain the "+"
 character (otherway it would be traslated to a space)

---
 framework/Security/TSecurityManager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Security')

diff --git a/framework/Security/TSecurityManager.php b/framework/Security/TSecurityManager.php
index d77e9b88..7eba92fe 100644
--- a/framework/Security/TSecurityManager.php
+++ b/framework/Security/TSecurityManager.php
@@ -77,7 +77,7 @@ class TSecurityManager extends TModule
 		if(null === $this->_validationKey) {
 			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
 				$this->_validationKey = $this->generateRandomKey();
-				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null);
+				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
 		return $this->_validationKey;
@@ -104,7 +104,7 @@ class TSecurityManager extends TModule
 		if(null === $this->_encryptionKey) {
 			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
 				$this->_encryptionKey = $this->generateRandomKey();
-				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null);
+				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
 		return $this->_encryptionKey;
-- 
cgit v1.2.3