Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -N -r11724 -r11838
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 11724)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 11838)
@@ -685,8 +685,6 @@
 				$filename = $category_data['NamedParentPath'];
 				$this->setCache('category_templates', $id, $filename /*$category_data['CachedTemplate']*/);
 				$this->setCache('category_tree', $id, $category_data['TreeLeft'] . ';' . $category_data['TreeRight']);
-
-//				$this->setCache('item_templates', $id, $category_data['CachedItemTemplate']);
 			}
 			else {
 				$resource_id = $this->Conn->GetOne('SELECT ResourceId FROM '.$table.' WHERE '.$id_field.' = '.$this->Conn->qstr($id));
@@ -1750,6 +1748,8 @@
 			$filename = $this->getFilename('c', $category_id);
 			if ($item_id) {
 				$mod_rw_helper =& $this->Application->recallObject('ModRewriteHelper');
+				/* @var $mod_rw_helper kModRewriteHelper */
+
 				$t = $mod_rw_helper->GetItemTemplate($category_id, $pass_element); // $pass_element should be the last processed element
 //				$t =  $this->getCache('item_templates', $category_id);
 			}