Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php
===================================================================
diff -u -r5735 -r5762
--- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5735)
+++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5762)
@@ -711,12 +711,8 @@
 			$cache->printStatistics();
 		}
 
-		$event_manager =& $this->recallObject('EventManager');
-		$event_manager->RunRegularEvents(reAFTER);
-
-		$session =& $this->recallObject('Session');
-		$session->SaveData();
-		//$this->SaveBlocksCache();
+		$this->EventManager->RunRegularEvents(reAFTER);
+		$this->Session->SaveData();
 	}
 
 	/**
@@ -1078,7 +1074,7 @@
 
 		// append pass through variables to each link to be build
 		$params = array_merge_recursive2($this->getPassThroughVariables(), $params);
-		
+
 		if ($this->RewriteURLs($ssl) && !$no_rewrite)
 		{
 			$session =& $this->recallObject('Session');
@@ -1103,13 +1099,13 @@
 	function getPassThroughVariables()
 	{
 		static $cached_pass_through = null;
-		
+
 		// because pass through is not changed during script run, then we can cache it
 		if (is_null($cached_pass_through)) {
-		
+
 			$cached_pass_through = Array();
 			$pass_through = $this->Application->GetVar('pass_through');
-			
+
 			if ($pass_through) {
 				// names of variables to pass to each link
 				$cached_pass_through['pass_through'] = $pass_through;
@@ -1118,13 +1114,13 @@
 					$cached_pass_through[$pass_through_var] = $this->Application->GetVar($pass_through_var);
 				}
 			}
-			
+
 		}
-		
+
 		return $cached_pass_through;
 	}
-	
 
+
 	/**
 	 * Returns sorted array of passed prefixes (to build url from)
 	 *