From 6773dfe453682d2b39a26fbabef8e706bf6bb412 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 26 Nov 2006 14:59:51 +0000
Subject: Merge from 3.0 branch till 1513.

---
 framework/TApplication.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'framework/TApplication.php')

diff --git a/framework/TApplication.php b/framework/TApplication.php
index 974f0ec4..ce05893b 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -437,9 +437,11 @@ class TApplication extends TComponent
 	 */
 	protected function saveGlobals()
 	{
-		if(!$this->_stateChanged)
-			return;
-		$this->getApplicationStatePersister()->save($this->_globals);
+		if($this->_stateChanged)
+		{
+			$this->_stateChanged=false;
+			$this->getApplicationStatePersister()->save($this->_globals);
+		}
 	}
 
 	/**
@@ -1035,6 +1037,7 @@ class TApplication extends TComponent
 	 */
 	public function onEndRequest()
 	{
+		$this->saveGlobals();  // save global state
 		$this->raiseEvent('OnEndRequest',$this,null);
 	}
 }
-- 
cgit v1.2.3