Index: branches/5.2.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r16339 -r16348
--- branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: url_manager.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -452,47 +452,20 @@
 	}
 
 	/**
-	 * Prepares case, when requested page wasn't found
-	 *
-	 * @param int $theme_id
-	 * @return array
-	 */
-	public function prepare404($theme_id = null)
-	{
-		if ( !isset($theme_id) ) {
-			$theme_id = $this->Application->GetVar('m_theme');
-		}
-
-		$not_found = $this->Application->ConfigValue('ErrorTemplate');
-		$vars['t'] = $not_found ? $not_found : 'error_notfound';
-
-		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
-
-		$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $theme_id);
-
-		header('HTTP/1.0 404 Not Found');
-
-		return $vars;
-	}
-
-	/**
 	 * Show 404 page and exit
 	 *
 	 * @return void
 	 * @access public
 	 */
 	public function show404()
 	{
-		$vars = $this->prepare404();
+		header('HTTP/1.0 404 Not Found');
 
-		foreach ($vars as $var_name => $var_value) {
-			$this->Application->SetVar($var_name, $var_value);
-		}
+		$not_found = $this->Application->ConfigValue('ErrorTemplate');
+		$template = $not_found ? $not_found : 'error_notfound';
 
-		// ensure parser is available (e.g. 404 page requested from event)
-		$this->Application->QuickRun();
+		$this->Application->QuickRun($template);
 		$this->Application->Done();
 		exit;
 	}
-}
\ No newline at end of file
+}