Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r5340 -r5505
--- trunk/core/kernel/application.php	(.../application.php)	(revision 5340)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 5505)
@@ -425,6 +425,7 @@
 
 		$this->registerClass('kArray', KERNEL_PATH.'/utility/params.php');
 		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php');
+		$this->registerClass('kHelper', KERNEL_PATH.'/kbase.php');
 
 		$this->registerClass('kCache', KERNEL_PATH.'/utility/cache.php', 'Cache', Array('Params'));
 		$this->registerClass('kHTTPQuery', KERNEL_PATH.'/utility/http_query.php', 'HTTPQuery', Array('Params') );
@@ -486,7 +487,7 @@
 	 * @param int $id
 	 * @return string
 	 */
-	function getFilename($prefix, $id)
+	function getFilename($prefix, $id, $category_id=null)
 	{
 		$filename = $this->getCache('filenames',  $prefix.'_'.$id);
 		if ($filename === false) {
@@ -509,10 +510,15 @@
 				$this->setCache('item_templates', $id, $category_data['CachedItemTemplate']);
 			}
 			else {
-				$sql = 'SELECT Filename
+				$resource_id = $this->Conn->GetOne('SELECT ResourceId FROM '.$table.' WHERE '.$id_field.' = '.$this->Conn->qstr($id));
+				if (is_null($category_id)) $category_id = $this->GetVar('m_cat_id');
+				$sql = 'SELECT Filename FROM '.TABLE_PREFIX.'CategoryItems WHERE ItemResourceId = '.$resource_id.' AND CategoryId = '.$category_id;
+				$filename = $this->Conn->GetOne($sql);
+
+				/*$sql = 'SELECT Filename
 						FROM '.$table.'
 						WHERE '.$id_field.' = '.$this->Conn->qstr($id);
-				$filename = $this->Conn->GetOne($sql);
+				$filename = $this->Conn->GetOne($sql);*/
 			}
 			$this->setCache('filenames', $prefix.'_'.$id, $filename);
 		}