Index: branches/5.0.x/core/units/helpers/themes_helper.php
===================================================================
diff -u -r12306 -r12634
--- branches/5.0.x/core/units/helpers/themes_helper.php	(.../themes_helper.php)	(revision 12306)
+++ branches/5.0.x/core/units/helpers/themes_helper.php	(.../themes_helper.php)	(revision 12634)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_helper.php 12306 2009-08-17 02:35:55Z dmitrya $
+* @version	$Id: themes_helper.php 12634 2009-09-29 12:50:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -375,18 +375,26 @@
 		 * Returns page id based on given template
 		 *
 		 * @param string $template
+		 * @param int $theme_id
 		 * @return int
 		 */
-		function getPageByTemplate($template)
+		function getPageByTemplate($template, $theme_id = null)
 		{
+			if (!isset($theme_id)) {
+				// during mod-rewrite url parsing current theme
+				// is not available to kHTTPQuery class, so don't use it
+				$theme_id = (int)$this->getCurrentThemeId();
+			}
+
 			$sql = 'SELECT ' . $this->Application->getUnitOption('c', 'IDField') . '
 					FROM ' . $this->Application->getUnitOption('c', 'TableName') . '
 					WHERE
 						(
 							(NamedParentPath = ' . $this->Conn->qstr('Content/' . $template) . ') OR
 							(IsSystem = 1 AND CachedTemplate = ' . $this->Conn->qstr($template) . ')
 						)
-						AND (ThemeId = ' . $this->getCurrentThemeId() . ' OR ThemeId = 0)';
+						AND (ThemeId = ' . $theme_id . ($theme_id > 0 ? ' OR ThemeId = 0' : '') . ')';
+
 			return $this->Conn->GetOne($sql);
 		}
 	}
\ No newline at end of file