Index: branches/RC/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r9866 -r10274
--- branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 9866)
+++ branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 10274)
@@ -748,6 +748,27 @@
 		list ($ret, $tag_processed) = $this->processAggregatedTag('ImageSrc', $params, $this->getPrefixSpecial());
 		return $tag_processed ? $ret : false;
 	}
+
+	function PageLink($params)
+	{
+		$t = isset($params['template']) ? $params['template'] : '';
+		unset($params['template']);
+
+		if (!$t) $t = $this->Application->GetVar('t');
+
+		if (isset($params['page'])) {
+			$this->Application->SetVar($this->getPrefixSpecial().'_Page', $params['page']);
+			unset($params['page']);
+		}
+
+		$params['m_cat_page'] = $this->Application->GetVar($this->getPrefixSpecial().'_Page');
+
+		if (!isset($params['pass'])) {
+			$params['pass'] = 'm,'.$this->getPrefixSpecial();
+		}
+
+		return $this->Application->HREF($t, '', $params);
+	}
 }
 
 ?>
\ No newline at end of file
Index: branches/RC/core/units/general/cat_tag_processor.php
===================================================================
diff -u -r10077 -r10274
--- branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 10077)
+++ branches/RC/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 10274)
@@ -61,6 +61,7 @@
 
 			$object =& $this->getObject($params);
 			$params['m_cat_id'] = $object->GetDBField('CategoryId');
+			$params['m_cat_page'] = 1;
 			$params['pass_category'] = 1;
 
 			return $this->Application->ProcessParsedTag('m', 't', $params);
@@ -242,6 +243,8 @@
 				$params['cat_id'] = $this->Application->findModule('Var', $this->Prefix, 'RootCat');
 			}
 
+			$params['m_cat_page'] = 1;
+
 			return $this->Application->ProcessParsedTag('c', 'CategoryLink', $params);
 		}
 
Index: branches/RC/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -r9608 -r10274
--- branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 9608)
+++ branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 10274)
@@ -25,6 +25,7 @@
 											subid="sub<inp2:m_Param name="root_cat"/>"
 											suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/subcats.xml"
 											 m_cat_id="$root_cat"
+											 m_cat_page="1"
 											 c_menu_Page="1" pass="m,c.menu"
 											 level="0" max_level="4" serial="$serial"
 											/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
@@ -35,7 +36,7 @@
 										<!--## USE droponclick="false" TO OPEN MENU ONMOUSE-OVER ##-->
 										  <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" droponclick="true" >
 										    <items>
-										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
+										    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[<inp2:m_RootCategoryName/>]]></item>
 										    	<inp2:m_ModuleInclude template="elements/menu.xml" />
 										    </items>
 										  </menubar>
@@ -64,7 +65,7 @@
 
 							<table>
 								<tr>
-									<inp2:m_Link template="index" m_cat_id="0" result_to_var="link"/>
+									<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1" result_to_var="link"/>
 									<inp2:m_RootCategoryName result_to_var="title"/>
 									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
 									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" />
@@ -85,7 +86,7 @@
 					<!-- menu: My Account -->
 					<inp2:m_RenderElement design="menu_element">
 						<inp2:m_Capture to_var="menu_href">
-							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
+							<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0" m_cat_page="1"/>
 						</inp2:m_Capture>
 
 						<inp2:m_Capture to_var="menu_icon">
@@ -104,7 +105,7 @@
 						<!-- menu: ShoppingCart -->
 						<inp2:m_RenderElement design="menu_element">
 							<inp2:m_Capture to_var="menu_href">
-								<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0"/>
+								<inp2:m_Link template="in-commerce/checkout/shop_cart" m_cat_id="0" m_cat_page="1"/>
 							</inp2:m_Capture>
 
 							<inp2:m_Capture to_var="menu_icon">
Index: branches/RC/themes/default2007/platform/designs/content_boxes.tpl
===================================================================
diff -u -r9707 -r10274
--- branches/RC/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 9707)
+++ branches/RC/themes/default2007/platform/designs/content_boxes.tpl	(.../content_boxes.tpl)	(revision 10274)
@@ -115,7 +115,7 @@
 			<inp2:m_if check="m_Param" name="prefix">
 				<a href="<inp2:{$prefix}_SuggestItemLink template="$template"/>"><inp2:m_Phrase label="$title"/></a>
 			<inp2:m_else/>
-				<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_Phrase label="$title"/></a>
+				<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1" />"><inp2:m_Phrase label="$title"/></a>
 			</inp2:m_if>
 		</td>
 	</tr>
@@ -148,7 +148,7 @@
 
 <inp2:m_DefineElement name="tab">
 	<td class="<inp2:m_if check="m_IsActive" template="$template">active-tab<inp2:m_else/>inactive-tab</inp2:m_if>">
-		<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_phrase name="$title"/></a>
+		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_phrase name="$title"/></a>
 	</td>
 	<td width="8">&nbsp;
 
Index: branches/RC/core/kernel/parser/template_parser.php
===================================================================
diff -u -r9286 -r10274
--- branches/RC/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 9286)
+++ branches/RC/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 10274)
@@ -681,7 +681,7 @@
 				unset($this->ParamsStack[$this->ParamsRecursionIndex--]);
 				$this->Params = $this->ParamsStack[$this->ParamsRecursionIndex];
 				$this->MainParser = true;
-				return $ret;
+				return defined('DBG_DECORATE_BLOCKS') && DBG_DECORATE_BLOCKS ? $this->decorateBlock($ret, $pass_params) : $ret;
 			}
 		}
 
@@ -719,6 +719,16 @@
 		return $o;
 	}
 
+	function decorateBlock(&$block_content, $block_params)
+	{
+		if (preg_match('/^(\s*)<td(.*?)>(.*)<\/td>(.*)$/is', $block_content, $regs)) {
+			// block with td -> put div inside td
+			return $regs[1].'<td '.$regs[2].'><div title="'.$block_params['name'].'" style="border: 1px solid blue;">'.$regs[3].'</div></td>'.$regs[4];
+		}
+
+		return '<div title="'.$block_params['name'].'" style="border: 1px solid red;">'.$block_content.'</div>';
+	}
+
 	function Recurve(&$tag)
 	{
 		$this->Recursion[++$this->RecursionIndex] =& $tag;
Index: branches/RC/themes/default2007/platform/elements/navigation_bar.tpl
===================================================================
diff -u -r8929 -r10274
--- branches/RC/themes/default2007/platform/elements/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 8929)
+++ branches/RC/themes/default2007/platform/elements/navigation_bar.tpl	(.../navigation_bar.tpl)	(revision 10274)
@@ -14,7 +14,7 @@
 	<inp2:m_if check="m_Param" name="category">
 		<a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_param name="title"/></a>
 	<inp2:m_else/>
-		<a href="<inp2:m_Link template="$template" m_cat_id="0"/>"><inp2:m_param name="title"/></a>
+		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
Index: branches/RC/themes/default2007/platform/elements/menu.xml.tpl
===================================================================
diff -u -r9602 -r10274
--- branches/RC/themes/default2007/platform/elements/menu.xml.tpl	(.../menu.xml.tpl)	(revision 9602)
+++ branches/RC/themes/default2007/platform/elements/menu.xml.tpl	(.../menu.xml.tpl)	(revision 10274)
@@ -10,6 +10,7 @@
 		subid="sub<inp2:m_Param name="root_cat"/>"
 		suburl="<inp2:m_link __NO_REWRITE__="1" template="platform/elements/subcats.xml"
 		 m_cat_id="$root_cat"
+		 m_cat_page="1"
 		 c_menu_Page="1" pass="m,c.menu"
 		 level="0" max_level="4" rand="$rand"
 		/>" ><![CDATA[<inp2:c_Field requery="1" name="Name"/>]]></item>
@@ -18,7 +19,7 @@
 <menumgr id="mgr" flowoverformelement="false" defaulteffect="fade" icpath="">
   <menubar id="menubar" orient="H" showicon="true" showsubicon="false" stlprf="horz_" >
     <items>
-    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[Home]]></item>
+    	<item id="sub-elem0" url="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>" ico="['<inp2:m_TemplatesBase module="In-portal"/>img/menu_home.gif']" enb="true" title=""><![CDATA[Home]]></item>
     	<inp2:m_ModuleInclude template="elements/menu.xml" />
     </items>
   </menubar>
Index: branches/RC/themes/default2007/platform/login/forgot_password_reset.tpl
===================================================================
diff -u -r9664 -r10274
--- branches/RC/themes/default2007/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 9664)
+++ branches/RC/themes/default2007/platform/login/forgot_password_reset.tpl	(.../forgot_password_reset.tpl)	(revision 10274)
@@ -40,7 +40,7 @@
 		<inp2:m_else />
 			<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
 			<br />	<br />
-			<a href="<inp2:m_Link template="index" m_cat_id="0"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
+			<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
 		</inp2:m_if>
 	</inp2:m_RenderElement>
 	<!-- // forgot password reset -->
Index: branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl
===================================================================
diff -u -r9750 -r10274
--- branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 9750)
+++ branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 10274)
@@ -9,7 +9,7 @@
 
 				<!-- IF LOGGED IN SHOW NAME -->
 				<inp2:m_if check="m_LoggedIn">
-					<a href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
+					<a href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0" m_cat_page="1"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
 				<!-- /IF LOGGED IN SHOW NAME -->
 				<inp2:m_else/>
 
@@ -61,7 +61,7 @@
 				<a href="<inp2:u_LogoutLink template="index" />"><inp2:m_Phrase label="lu_logout"/></a>
 			</td>
 		</tr>
-		
+
 		<tr>
 			<td colspan="2">
 		<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="7" border="0" /><br />
@@ -70,7 +70,7 @@
 
 		<tr>
 			<td colspan="2">
-				<strong><inp2:m_phrase name="lu_section_MyItems"/></strong>				
+				<strong><inp2:m_phrase name="lu_section_MyItems"/></strong>
 			</td>
 		</tr>
 
@@ -114,10 +114,10 @@
 		</inp2:m_if>
 
 		<inp2:m_if check="u_RegistrationEnabled">
-			<a href="<inp2:m_Link template="platform/login/register" m_cat_id="0"/>" class="more-link" ><inp2:m_Phrase label="lu_Register"/></a> <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
+			<a href="<inp2:m_Link template="platform/login/register" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_Register"/></a> <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
 		</inp2:m_if>
 
-		<a href="<inp2:m_Link template="platform/login/forgot_password" m_cat_id="0"/>" class="more-link" ><inp2:m_Phrase label="lu_ForgotPassword"/>?</a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" />
+		<a href="<inp2:m_Link template="platform/login/forgot_password" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_ForgotPassword"/>?</a>  <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" />
 		<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
 		<input type="hidden" name="pending_disabled_template" value="platform/login/login_pending_disabled" />
 	</form>
Index: branches/RC/themes/default2007/platform/designs/categories.tpl
===================================================================
diff -u -r10006 -r10274
--- branches/RC/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 10006)
+++ branches/RC/themes/default2007/platform/designs/categories.tpl	(.../categories.tpl)	(revision 10274)
@@ -13,9 +13,9 @@
 					<inp2:m_else/>
 						<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
 						<inp2:m_if check="IsCategorySymLink">
-							<a href="<inp2:CategoryLink template="__default__"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
+							<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
 						<inp2:m_else/>
-							<a href="<inp2:CategoryLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
+							<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a> <span class="item-statistics">(<!--## <inp2:m_phrase name="lu_SubCats"/>: ##--><inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
 						</inp2:m_if>
 						<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
 					</inp2:m_if>
@@ -46,9 +46,9 @@
 	<!--## CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
 	<li>
 	<inp2:m_if check="IsCategorySymLink">
-		<a href="<inp2:CategoryLink template="__default__"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a>
+		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><i><inp2:Field name="Name"/> @</i></a>
 	<inp2:m_else/>
-		<a href="<inp2:CategoryLink template="__default__"/>" class="text-title"><inp2:Field name="Name"/></a>
+		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="text-title"><inp2:Field name="Name"/></a>
 	</inp2:m_if>
 	</li>
 	<!--## /CHECK IF CATEGORY IS SYM. LINK POINTING TO OTHER CATEGORY ##-->
@@ -78,7 +78,7 @@
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
 		</td>
 		<td>
-			<a href="<inp2:CategoryLink template="__default__"/>" class="sub-category"><inp2:Field name="Name"/></a>
+			<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="sub-category"><inp2:Field name="Name"/></a>
 		</td>
 	</tr>
 </inp2:m_DefineElement>
@@ -89,7 +89,7 @@
 			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
 		</td>
 		<td>
-			<a href="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0"/></inp2:m_if>" class="sub-category">
+			<a href="<inp2:m_if check="m_Param" name="external_url"><inp2:m_Param name="external_url"/><inp2:m_else/><inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/></inp2:m_if>" class="sub-category">
 				<inp2:m_Param name="title"/>
 			</a>
 		</td>
@@ -108,7 +108,7 @@
 				<inp2:cms_CachedMenu level="0" category_id="0" render_as="sitemap_subpage_element"/>
 			</table>
 		<inp2:m_else/>
-			<a href="<inp2:CategoryLink template="__default__"/>" class="top-category"><inp2:Field name="Name"/></a><br />
+			<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><inp2:Field name="Name"/></a><br />
 			<table>
 				<inp2:ListCategories requery="1" render_as="sitemap_subcategory_element" per_page="-1" no_table="1"/>
 			</table>
Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -r10098 -r10274
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 10098)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 10274)
@@ -1379,7 +1379,10 @@
 					$env .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
 				}
 			}
-			if (!$m_only) $params['pass_category'] = 1;
+
+			if (!$m_only || preg_match('/c\.[-\d]*/', implode(',', $pass_info))) {
+				$params['pass_category'] = 1;
+			}
 			$ret = $this->BuildModuleEnv_NEW('m', $params, $pass_events).$ret;
 			$cat_processed = isset($params['category_processed']) && $params['category_processed'];
 			if ($cat_processed) {
Index: branches/RC/themes/default2007/platform/elements/header.tpl
===================================================================
diff -u -r9720 -r10274
--- branches/RC/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 9720)
+++ branches/RC/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 10274)
@@ -1,7 +1,7 @@
 <table class="top-background fullwidth">
 	<tr>
 		<td width="203">
-			<a href="<inp2:m_Link template="index" m_cat_id="0"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/inportal_logo.gif" width="203" height="54" alt="" /></a><br />
+			<a href="<inp2:m_Link template="index" m_cat_id="0" m_cat_page="1"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/inportal_logo.gif" width="203" height="54" alt="" /></a><br />
 		</td>
 
 		<!-- TOP-BANNER -->
Index: branches/RC/core/units/general/main_event_handler.php
===================================================================
diff -u -r10098 -r10274
--- branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 10098)
+++ branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 10274)
@@ -108,8 +108,8 @@
 				}
 			}
 
-			if( $processed_params['m_cat_page'] > 1 || $force_page_adding )
-			{
+			if( (array_key_exists('category_processed', $url_params) && $url_params['category_processed'] && ($processed_params['m_cat_page'] > 1)) || $force_page_adding ) {
+				// category page number found & category name was added before
 				$ret = preg_replace('/(.*)\//', '\\1', $ret).'_'.$processed_params['m_cat_page'].'/';
 			}
 
Index: branches/RC/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r9866 -r10274
--- branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 9866)
+++ branches/RC/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 10274)
@@ -896,6 +896,30 @@
 
 		return $type_clauses;
 	}
+
+	/**
+	 * Set's correct page for list
+	 * based on data provided with event
+	 *
+	 * @param kEvent $event
+	 * @access private
+	 * @see OnListBuild
+	 */
+	function SetPagination(&$event)
+	{
+		parent::SetPagination($event);
+
+		if (!$this->Application->IsAdmin()) {
+			$page_var = $event->getEventParam('page_var');
+			if ($page_var !== false) {
+				$page = $this->Application->GetVar($page_var);
+				if (is_numeric($page)) {
+					$object =& $event->getObject();
+					$object->SetPage($page);
+				}
+			}
+		}
+	}
 }
 
 ?>
\ No newline at end of file
Index: branches/RC/themes/default2007/platform/my_account/my_account.tpl
===================================================================
diff -u -r9664 -r10274
--- branches/RC/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 9664)
+++ branches/RC/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 10274)
@@ -20,7 +20,7 @@
 		<img src="<inp2:m_TemplatesBase />/<inp2:m_param name="icon_image"/>" alt="" /><br />
 	</td>
 	<td class="directory-text">
-		<a href="<inp2:m_Link template="$template" m_cat_id="0"/>" class="text-title"><inp2:m_Phrase name="$title"/></a>
+		<a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1" class="text-title"><inp2:m_Phrase name="$title"/></a>
 		<br />
 		<inp2:m_Phrase name="$description"/>
 	</td>
Index: branches/RC/themes/default2007/platform/elements/content_boxes/sub_categories.tpl
===================================================================
diff -u -r9797 -r10274
--- branches/RC/themes/default2007/platform/elements/content_boxes/sub_categories.tpl	(.../sub_categories.tpl)	(revision 9797)
+++ branches/RC/themes/default2007/platform/elements/content_boxes/sub_categories.tpl	(.../sub_categories.tpl)	(revision 10274)
@@ -19,7 +19,7 @@
 </inp2:m_RenderElement>
 
 <inp2:m_RenderElement design="content_box_noheader" data_exists="1" <!--##block_no_data="no_categories" ##--> >
-	<inp2:c_InitList list_name="sub_categories"/>
+	<inp2:c_InitList list_name="sub_categories" page_var="m_cat_page"/>
 
 	<inp2:m_Capture to_var="header">
 		<inp2:m_phrase name="lu_title_Categories"/> (<inp2:c_TotalRecords list_name="sub_categories"/>)
@@ -45,6 +45,6 @@
 	<table class="fullwidth">
 		<inp2:c_ListCategories list_name="sub_categories" render_as="category_element" columns="2" direction="H"/>
 	</table>
-	<!--## <br /><inp2:m_include template="platform/elements/pagination" prefix="c"/> ##-->
+	<br /><inp2:m_include template="platform/elements/pagination" prefix="c" list_name="sub_categories"/>
 </inp2:m_RenderElement>
 <!-- // categories -->
\ No newline at end of file