Index: branches/5.0.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r12734 -r12784
--- branches/5.0.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 12734)
+++ branches/5.0.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 12784)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: mod_rewrite_helper.php 12784 2009-10-25 20:29:54Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -138,12 +138,7 @@
 
 			$this->_parseLanguage($url_parts, $vars);
 			$this->_parseTheme($url_parts, $vars);
-			$this->_setDefaultPages($vars);
 
-			if ($this->_parsePage($url_parts, $vars)) {
-				$this->_partsFound[] = 'parsePage';
-			}
-
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_page>
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<module_page> (category-based section template)
 			// http://site-url/<language>/<theme>/<category>[_<category_page>]/<template>/<module_item>
@@ -201,7 +196,22 @@
 		{
 			$this->initRewriteListeners();
 
+			$page_number = $this->_parsePage($url_parts, $vars);
+
+			if ($page_number) {
+				$this->_partsFound[] = 'parsePage';
+			}
+
 			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
+				// set default page
+				$vars[$prefix . '_Page'] = 1; // will override page in session in case, when none is given in url
+
+				if ($page_number) {
+					// page given in url - use it
+					$vars[$prefix . '_id'] = 0;
+					$vars[$prefix . '_Page'] = $page_number;
+				}
+
 				$listener_result = $listener[0]->$listener[1](REWRITE_MODE_PARSE, $prefix, $vars, $url_parts);
 				if ($listener_result === false) {
 					// will not proceed to other methods
@@ -501,19 +511,6 @@
 		}
 
 		/**
-		 * Set's 1st page for all modules (will be used when not passed in url)
-		 *
-		 * @param Array $vars
-		 */
-		function _setDefaultPages(&$vars)
-		{
-			// set 1st page for all rewrite listeners, since we don't know which of them will need it
-			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
-				$vars[$prefix . '_Page'] = 1;
-			}
-		}
-
-		/**
 		 * Set's page (when found) to all modules
 		 *
 		 * @param Array $url_parts
@@ -533,15 +530,9 @@
 				return false;
 			}
 
-			// set module pages for all modules, since we don't know which module will need it
-			foreach ($this->Application->RewriteListeners as $prefix => $listener) {
-				$vars[$prefix . '_id'] = 0;
-				$vars[$prefix . '_Page'] = $page_number;
-			}
-
 			array_pop($url_parts);
 
-			return true;
+			return $page_number;
 		}
 
 		/**