Index: trunk/kernel/include/item.php
===================================================================
diff -u -N -r8009 -r8061
--- trunk/kernel/include/item.php	(.../item.php)	(revision 8009)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 8061)
@@ -1167,32 +1167,33 @@
 		$name = $this->StripDisallowed($name);
 
 		if ( $name != $this->Get('Filename') ) $this->Set('Filename', $name);
+		
+		// update filename in category items
+		$filename = $this->Get('Filename');
+		$db =& GetADODBConnection();
+		$sql = 'UPDATE '.TABLE_PREFIX.'CategoryItems
+				SET Filename = '.$db->qstr($filename).'
+				WHERE ItemResourceId = '.$this->Get('ResourceId');
+		$db->Query($sql);
 	}
 
 	function Update($UpdatedBy = null)
-    {
-    	$ret = parent::Update($UpdatedBy);
+	{
+		// make Filename field virtual
+		unset($this->m_dirtyFieldsMap['Filename']);
 
-      $this->GenerateFilename();
-      $db =& GetADODBConnection();
-      if ($ret) {
-				$filename = $this->Get('Filename');
-				$sql = 'UPDATE '.TABLE_PREFIX.'CategoryItems
-						SET Filename = '.$db->qstr($filename).'
-						WHERE ItemResourceId = '.$this->Get('ResourceId');
-				$db->Query($sql);
-			}
+		$ret = parent::Update($UpdatedBy);
+		if ($ret) {
+			$this->GenerateFilename();
+		}
+	}
 
-//    	parent::Update($UpdatedBy);
-
-    }
-
     function Create()
     {
-    	parent::Create();
-
-    	$this->GenerateFilename();
-    	parent::Update();
+    	$ret = parent::Create();
+    	if ($ret) {
+			$this->GenerateFilename();
+		}
     }
 
 }