Index: branches/5.3.x/core/kernel/application.php
===================================================================
diff -u -N -r15698 -r15902
--- branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 15698)
+++ branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 15902)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 15698 2013-02-19 11:33:17Z alex $
+* @version	$Id: application.php 15902 2013-07-12 15:37:15Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -689,7 +689,7 @@
 		}
 
 		if ( !$this->siteDomain ) {
-			$this->siteDomain = $this->recallObject('site-domain.current');
+			$this->siteDomain = $this->recallObject('site-domain.current', null, Array ('live_table' => true));
 			/* @var $site_domain kDBItem */
 		}
 
@@ -997,7 +997,7 @@
 	public function redirectToMaintenance()
 	{
 		$maintenance_page = WRITEBALE_BASE . '/maintenance.html';
-		$query_string = ''; // $this->isAdmin ? '' : '?next_template=' . urlencode($_SERVER['REQUEST_URI']);
+		$query_string = ''; // $this->isAdmin ? '' : '?next_template=' . kUtil::escape($_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL);
 
 		if ( file_exists(FULL_PATH . $maintenance_page) ) {
 			header('Location: ' . BASE_PATH . $maintenance_page . $query_string);
@@ -1029,7 +1029,7 @@
 				$redirect_params = Array ();
 
 				if ( !$this->isAdmin ) {
-					$redirect_params['next_template'] = urlencode($_SERVER['REQUEST_URI']);
+					$redirect_params['next_template'] = kUtil::escape($_SERVER['REQUEST_URI'], kUtil::ESCAPE_URL);
 				}
 
 				$this->Redirect($maintenance_template, $redirect_params);
@@ -1111,8 +1111,12 @@
 	 */
 	public function QuickRun()
 	{
+		// discard any half-parsed content
+		ob_clean();
+
+		// replace current page content with 404
 		$this->InitParser();
-		$this->HTML = $this->ParseBlock(Array ('name' => $this->GetVar('t')));
+		$this->HTML = $this->Parser->Run($this->GetVar('t'));
 	}
 
 	/**