Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r15727 -r15856
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15727)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15856)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 15727 2013-04-10 18:04:16Z alex $
+* @version	$Id: application.php 15856 2013-07-02 14:56:00Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -991,7 +991,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);
@@ -1023,7 +1023,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);