Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r1140 -r1185
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1140)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1185)
@@ -2090,6 +2090,7 @@
 	   $GroupList = NULL;
 		        
   	 $sql = $this->GetCountSQL($p,NULL,$GroupList,$where);
+
   	 return $sql;
   }
   
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r1170 -r1185
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1170)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1185)
@@ -3004,9 +3004,12 @@
     	else
     	{
     	  $ListVar =& GetItemCollection($attribs["_itemtype"]);	
-		  if(is_object($ListVar))
-  		  {     		  		  	  		  			      		      	
+		  if(is_object($ListVar))		  
+  		  { 	
+  		  		//echo get_class($ListVar)."<br>";
+  		  		//print_pre($attribs);
   		      	$ret = $ListVar->PerformItemCount($attribs);
+  		      	//echo "m_itemcount: $ret<br>";
   		  }          
        	}
     }
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r1022 -r1185
--- trunk/kernel/include/category.php	(.../category.php)	(revision 1022)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 1185)
@@ -1046,12 +1046,14 @@
                  $type = $objItemTypes->GetTypeByName($typestr);
                  if(is_object($type))
                  {
+                   $ForceUpdate = 1;
                    $TypeId = $type->Get("ItemType");
             	   $GroupOnly = $element->GetAttributeByName('_grouponly') ? 1 : 0;
             	   $txt = "<inp:m_itemcount _CatId=\"".$this->Get("CategoryId")."\" _SubCats=\"1\" ";
-            	   $txt .=" _ListType=\"category\" _CountCurrent=\"1\" _ItemType=\"$TypeId\" _GroupOnly=\"$GroupOnly\" />";
+            	   $txt .=" _ListType=\"category\" _CountCurrent=\"1\" _ForceUpdate=\"$ForceUpdate\" _ItemType=\"$TypeId\" _GroupOnly=\"$GroupOnly\" />";
             	   $tag = new clsHtmlTag($txt);
-            	   $ret = $tag->Execute();	            	
+            	   $ret = $tag->Execute();	
+            	   //echo "Category parseobject: $ret<br>";
                  }
                  else
                    $ret = "";
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql
===================================================================
diff -u -N -r1176 -r1185
--- trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql	(.../inportal_upgrade_v1.0.10.sql)	(revision 1176)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.10.sql	(.../inportal_upgrade_v1.0.10.sql)	(revision 1185)
@@ -2,9 +2,18 @@
 ALTER TABLE PortalGroup DROP INDEX ResourceId, ADD UNIQUE ResourceId (ResourceId);
 ALTER TABLE PortalUser DROP INDEX ResourceId, ADD UNIQUE ResourceId (ResourceId);
 
+ALTER TABLE PortalUser ADD PwResetConfirm VARCHAR(255);
+ALTER TABLE PortalUser ADD UNIQUE (PwResetConfirm);
+ALTER TABLE PortalUser ADD PwRequestTime BIGINT(20);
+ALTER TABLE PortalUser ADD MinPwResetDelay INT DEFAULT '1800' NOT NULL;
+
+ALTER TABLE CustomMetaData ADD INDEX (ResourceId);
+ALTER TABLE CustomMetaData ADD INDEX (CustomFieldId);
+
 ALTER TABLE PortalUser ADD PassResetTime BIGINT(20);
 
 INSERT INTO Events VALUES (67, 'USER.PSWDC', '1', '0', 'In-Portal:Users', 'la_event_user.pswd_confirm', '0');
+INSERT INTO Events VALUES (45, 'USER.ADD.PENDING', 2, 0, 'In-Portal:Users', 'la_event_user.add.pending', 1)
 
 INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 3, 0);
 
@@ -16,11 +25,3 @@
 DELETE FROM ConfigurationAdmin WHERE VariableName = 'Smtp_SendHTML';
 
 UPDATE Modules SET Version = '1.0.10' WHERE Name = 'In-Portal';
-
-ALTER TABLE PortalUser ADD PwResetConfirm VARCHAR(255);
-ALTER TABLE PortalUser ADD UNIQUE (PwResetConfirm);
-ALTER TABLE PortalUser ADD PwRequestTime BIGINT(20);
-ALTER TABLE PortalUser ADD MinPwResetDelay INT DEFAULT '1800' NOT NULL;
-
-ALTER TABLE CustomMetaData ADD INDEX (ResourceId);
-ALTER TABLE CustomMetaData ADD INDEX (CustomFieldId);
\ No newline at end of file
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -N -r994 -r1185
--- trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 994)
+++ trunk/admin/install/inportal_data.sql	(.../inportal_data.sql)	(revision 1185)
@@ -165,6 +165,7 @@
 INSERT INTO Events VALUES (38, 'USER.PSWD', 2, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 1)
 INSERT INTO Events VALUES (39, 'USER.PSWD', 1, 0, 'In-Portal:Users', 'la_event_user.forgotpw', 0)
 INSERT INTO Events VALUES (45, 'USER.ADD.PENDING', 1, 0, 'In-Portal:Users', 'la_event_user.add.pending', 0)
+INSERT INTO Events VALUES (45, 'USER.ADD.PENDING', 2, 0, 'In-Portal:Users', 'la_event_user.add.pending', 1)
 INSERT INTO Events VALUES (47, 'CATEGORY.ADD', 1, 0, 'In-Portal:Category', 'la_event_category.add', 0)
 INSERT INTO Events VALUES (48, 'CATEGORY.ADD.PENDING', 1, 0, 'In-Portal:Category', 'la_event_category.add.pending', 0)
 INSERT INTO Events VALUES (49, 'CATEGORY.ADD.PENDING', 2, 0, 'In-Portal:Category', 'la_event_category.add.pending', 1)