Index: branches/5.1.x/core/kernel/db/cat_dbitem.php
===================================================================
diff -u -N -r14394 -r14439
--- branches/5.1.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 14394)
+++ branches/5.1.x/core/kernel/db/cat_dbitem.php	(.../cat_dbitem.php)	(revision 14439)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_dbitem.php 14394 2011-06-28 13:46:34Z alex $
+* @version	$Id: cat_dbitem.php 14439 2011-07-08 10:04:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -75,9 +75,12 @@
 	 */
 	function assignPrimaryCategory()
 	{
-		$primary_category = $this->GetDBField('CategoryId') > 0 ? $this->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
-		$this->assignToCategory($primary_category, true);
-		$this->SetDBField('CategoryId', $primary_category); // set primary category in item object
+		if ( $this->GetDBField('CategoryId') <= 0 ) {
+			// set primary category in item object
+			$this->SetDBField('CategoryId', $this->Application->GetVar('m_cat_id'));
+		}
+
+		$this->assignToCategory($this->GetDBField('CategoryId'), true);
 	}
 
 	function Update($id=null, $system_update=false)
@@ -125,7 +128,6 @@
 		return $table;
 	}
 
-
 	function checkFilename()
 	{
 		if( !$this->GetDBField('AutomaticFilename') )