Index: trunk/kernel/action.php
===================================================================
diff -u -N -r3895 -r3983
--- trunk/kernel/action.php	(.../action.php)	(revision 3895)
+++ trunk/kernel/action.php	(.../action.php)	(revision 3983)
@@ -78,10 +78,10 @@
 	  	  	$dupe_user = '';
 			//$user_pending = (int)$_POST["user_pending"];
 			//$user_enabled = (int)$_POST["user_enabled"];
-			$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
+			$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
          	$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
 
-			$dob = DateTimestamp($_POST["user_dob"],GetDateFormat());
+			$dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));
 
 		  	$objEditItems = new clsUserManager();
 		  	$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
@@ -153,9 +153,9 @@
 			break;
 
 		case "m_edit_user":
-			//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
+			//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
          	//$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
-            $dob = DateTimestamp($_POST["user_dob"],GetDateFormat());
+            $dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));
 			$objEditItems = new clsUserManager();
 			$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 			//$user_pending = (int)$_POST["user_pending"];
@@ -236,7 +236,7 @@
 
 
 		case 'm_group_edit': // when editing user membership in group
-			$membership_expires = DateTimestamp( $_POST['membership_expires_date'], GetDateFormat() );
+			$membership_expires = DateTimestamp( $_POST['membership_expires_date'], GetDateFormat(0, true) );
 			$membership_expires += SecondsSinceMidnight( $_POST['membership_expires_time'] );
 
 			$objEditItems = new clsUserGroupList();
@@ -780,12 +780,12 @@
 
 
      case "m_add_category":
-         if(ValidDate($_POST["cat_date"],GetDateFormat()))
-         {
-           $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat());
+         if (ValidDate($_POST['cat_date'], GetDateFormat(0, true))) {
+			$CreatedOn = DateTimestamp($_POST['cat_date'],GetDateFormat(0, true));
          }
-         else
-           $CreatedOn = adodb_mktime();
+         else {
+			$CreatedOn = adodb_mktime();
+         }
          $html = (int)$_POST["html_enable"];
 
          $cat_pick = GetVar('cat_pick');
@@ -823,7 +823,7 @@
      break;
 
      case "m_edit_category":
-         $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat());
+         $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat(0, true));
          $cat_pick = GetVar('cat_pick');
          $Status = (int)$_POST["status"];
          $Hot = false; //(int)$_POST["itemhot"];
@@ -1062,7 +1062,7 @@
          $Pending = (int)$_POST["review_pending"];
          $Enabled = (int)$_POST["review_enabled"];
          $Status = (int)$_POST["status"];
-         $CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat());
+         $CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat(0, true));
          $CreatedOn += SecondsSinceMidnight($_POST["review_time"]);
          $html = (int)$_POST["html_enable"];
          $ReviewText = inp_escape($_POST["review_body"],1);
@@ -1112,7 +1112,7 @@
          $objReviews = new clsItemReviewList();
          $objReviews->SourceTable = $objSession->GetEditTable("ItemReview");
          $Status = (int)$_POST["status"];
-         $CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat());
+         $CreatedOn = DateTimestamp($_POST["review_date"],GetDateFormat(0, true));
          $CreatedOn += SecondsSinceMidnight($_POST["review_time"]);
          $html = (int)$_POST["html_enable"];
          $ReviewText = inp_escape($_POST["review_body"],1);
@@ -2507,8 +2507,7 @@
 	    $objUserGroupsList->CopyFromEditTable("PortalUserId");
 
 	    $user_ids = $objUsers->CopyFromEditTable("PortalUserId");
-	    if($user_ids)
-		{
+	    if ($user_ids) {
 			$db =& GetADODBConnection();
 			$sql = 'SELECT ResourceId FROM '.$objUsers->SourceTable.' WHERE PortalUserId IN ('.implode(',', $user_ids).')';
 			$rids = $db->GetCol($sql);
@@ -2533,8 +2532,15 @@
 	{
 		$objUserGroupsList = new clsUserGroupList();
 	    $objUserGroupsList->CopyFromEditTable("GroupId");
-	    $objGroups->CopyFromEditTable("GroupId");
-	    $objCustomDataList->CopyFromEditTable("CustomDataId");
+	    
+	    $group_ids = $objGroups->CopyFromEditTable("GroupId");
+	    if ($group_ids) {
+			$db =& GetADODBConnection();
+			$sql = 'SELECT ResourceId FROM '.$objGroups->SourceTable.' WHERE GroupId IN ('.implode(',', $group_ids).')';
+			$rids = $db->GetCol($sql);
+			$objCustomDataList->CopyFromEditTable("CustomDataId", $rids);
+		}
+		
 	    $objGroups->Clear();
 	}
 	if( GetVar('GroupEditStatus') == 2 )