Index: branches/unlabeled/unlabeled-1.15.2/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r4247 -r4437
--- branches/unlabeled/unlabeled-1.15.2/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4247)
+++ branches/unlabeled/unlabeled-1.15.2/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4437)
@@ -62,7 +62,7 @@
 									            'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
-            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '0'),
+            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
Index: branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.1.8.sql
===================================================================
diff -u -N -r4433 -r4437
--- branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4433)
+++ branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.1.8.sql	(.../inportal_upgrade_v1.1.8.sql)	(revision 4437)
@@ -13,5 +13,6 @@
 CREATE TABLE CategoryCustomData (CustomDataId int(11) NOT NULL auto_increment, ResourceId int(10) unsigned NOT NULL default '0', PRIMARY KEY  (CustomDataId));
 
 ALTER TABLE Category ADD CategoryTemplate VARCHAR(255) NOT NULL, ADD ItemTemplate VARCHAR(255) NOT NULL, ADD CachedCategoryTemplate VARCHAR(255) NOT NULL, ADD CachedItemTemplate VARCHAR(255) NOT NULL;
+ALTER TABLE Category CHANGE AutomaticFilename AutomaticFilename TINYINT(3) UNSIGNED NOT NULL DEFAULT '1';
 
 UPDATE Modules SET Version = '1.1.8' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.53.2/kernel/include/category.php
===================================================================
diff -u -N -r4382 -r4437
--- branches/unlabeled/unlabeled-1.53.2/kernel/include/category.php	(.../category.php)	(revision 4382)
+++ branches/unlabeled/unlabeled-1.53.2/kernel/include/category.php	(.../category.php)	(revision 4437)
@@ -2077,7 +2077,7 @@
   }
 
 
-	function &Add_NEW($fields_hash)
+	function &Add_NEW($fields_hash, $from_import = false)
 	{
   		global $objSession;
   		
@@ -2097,16 +2097,19 @@
 	  	}
 	
 	  	$d->Create();
-	  	if ($d->Get('Status') == STATUS_ACTIVE) {
-	  		$d->SendUserEventMail("CATEGORY.ADD", $objSession->Get("PortalUserId"));
-	  		$d->SendAdminEventMail("CATEGORY.ADD");
+	  	
+	  	if (!$from_import) {
+		  	if ($d->Get('Status') == STATUS_ACTIVE) {
+		  		$d->SendUserEventMail("CATEGORY.ADD", $objSession->Get("PortalUserId"));
+		  		$d->SendAdminEventMail("CATEGORY.ADD");
+		  	}
+		  	else
+		  	{
+		  		$d->SendUserEventMail("CATEGORY.ADD.PENDING", $objSession->Get("PortalUserId"));
+		  		$d->SendAdminEventMail("CATEGORY.ADD.PENDING");
+		  	}
+		  	$d->UpdateCachedPath();
 	  	}
-	  	else
-	  	{
-	  		$d->SendUserEventMail("CATEGORY.ADD.PENDING", $objSession->Get("PortalUserId"));
-	  		$d->SendAdminEventMail("CATEGORY.ADD.PENDING");
-	  	}
-	  	$d->UpdateCachedPath();
 	  	return $d;
 	}
   
Index: branches/unlabeled/unlabeled-1.15.2/core/units/categories/categories_config.php
===================================================================
diff -u -N -r4247 -r4437
--- branches/unlabeled/unlabeled-1.15.2/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4247)
+++ branches/unlabeled/unlabeled-1.15.2/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4437)
@@ -62,7 +62,7 @@
 									            'ParentId' => Array('type' => 'int','not_null' => '1','default' => '0'),
 									            'Name' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'Filename' => Array('type' => 'string','not_null' => '1','default' => ''),
-            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '0'),
+            									'AutomaticFilename' => Array('type' => 'int','not_null' => '1','default' => '1'),
 									            'Description' => Array('type' => 'string','not_null' => '1','default' => ''),
 									            'CreatedOn' => Array('formatter' => 'kDateFormatter', 'default'=>'#NOW#', 'not_null' => '1'),
 									            'EditorsPick' => Array('type' => 'int','default' => ''),
Index: branches/unlabeled/unlabeled-1.49.2/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r4349 -r4437
--- branches/unlabeled/unlabeled-1.49.2/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4349)
+++ branches/unlabeled/unlabeled-1.49.2/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 4437)
@@ -19,7 +19,7 @@
   ParentId int(11) NOT NULL default '0',
   Name varchar(255) NOT NULL default '',
   Filename varchar(255) NOT NULL,
-  AutomaticFilename tinyint(3) unsigned NOT NULL default '0',
+  AutomaticFilename tinyint(3) unsigned NOT NULL default '1',
   Description text NOT NULL,
   CreatedOn int(11) NOT NULL default '0',
   EditorsPick tinyint(4) NOT NULL default '0',