Index: branches/5.3.x/core/kernel/utility/http_query.php
===================================================================
diff -u -r16519 -r16600
--- branches/5.3.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 16600)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: http_query.php 16600 2017-07-29 06:19:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -99,21 +99,25 @@
 	protected $_trustProxy = false;
 
 	/**
-	 * Loads info from $_POST, $_GET and
-	 * related arrays into common place
+	 * Loads info from $_POST, $_GET and related arrays into common place.
 	 *
-	 * @param string $order
-	 * @access public
+	 * @param string $order Order.
+	 *
+	 * @throws RuntimeException When "Proxy" header is present in Web Request.
 	 */
 	public function __construct($order = 'CGPF')
 	{
 		parent::__construct();
 
 		$this->Order = $order;
 
-		if ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
-			// when AJAX request is made from jQuery, then create ajax variable,
-			// so any logic based in it (like redirects) will not break down
+		if ( isset($_SERVER['HTTP_PROXY']) && PHP_SAPI !== 'cli' ) {
+			throw new RuntimeException('Web Requests with "Proxy" header are forbidden.');
+		}
+
+		if ( isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' ) {
+			// When AJAX request is made from jQuery, then create ajax variable,
+			// so any logic based in it (like redirects) will not break down.
 			$_GET['ajax'] = 'yes';
 		}
 
@@ -358,6 +362,16 @@
 				trigger_error('Non mod-rewrite url "<strong>' . $_SERVER['REQUEST_URI'] . '</strong>" used', E_USER_NOTICE);
 				$this->Application->Redirect('', $url_params);
 			}
+
+			if ( $this->Application->GetVar('is_friendly_url') ) {
+				$url_params = $this->getRedirectParams();
+
+				// No idea about how to check, that given template
+				// require category to be passed with it, so pass anyway.
+				$url_params['pass_category'] = 1;
+
+				$this->Application->Redirect('', $url_params);
+			}
 		}
 		else {
 			$this->Application->VerifyThemeId();