Index: branches/5.0.x/core/units/themes/themes_eh.php
===================================================================
diff -u -r12299 -r12357
--- branches/5.0.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 12299)
+++ branches/5.0.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 12357)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_eh.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: themes_eh.php 12357 2009-08-22 10:20:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -102,9 +102,10 @@
 			$this->Application->SetVar('m_cat_id', 0);
 
 			if (MOD_REWRITE) {
-				foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
-					$this->Application->DeleteVar($module_data['Var'].'_Page');
-				}
+				$mod_rewrite_helper =& $this->Application->recallObject('ModRewriteHelper');
+				/* @var $mod_rewrite_helper kModRewriteHelper */
+
+				$mod_rewrite_helper->removePages();
 			}
 
 			$this->Application->SetVar('m_theme', $this->Application->GetVar('theme'));