Index: trunk/kernel/action.php
===================================================================
diff -u -N -r3983 -r4077
--- trunk/kernel/action.php	(.../action.php)	(revision 3983)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4077)
@@ -75,6 +75,8 @@
         	break;
 
 		case "m_add_user":
+			$application =& kApplication::Instance();
+        	$application->SetVar('u_mode', 't');
 	  	  	$dupe_user = '';
 			//$user_pending = (int)$_POST["user_pending"];
 			//$user_enabled = (int)$_POST["user_enabled"];
@@ -144,15 +146,18 @@
             			}
             		}
             	}
-            	if($DataChanged)
-            		$objCustomEdit->SaveData();
+            	if ($DataChanged) {
+            		$objCustomEdit->SaveData('u', $u->Get('ResourceId'));
+            	}
 
             	$objCustomEdit->SetTable('live');
 			}
 
 			break;
 
 		case "m_edit_user":
+			$application =& kApplication::Instance();
+        	$application->SetVar('u_mode', 't');
 			//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
          	//$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
             $dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));
@@ -208,8 +213,9 @@
             	}
             }
 
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$objCustomEdit->SaveData('u', $u->Get('ResourceId'));
+            }
             $objCustomEdit->SetTable('live');
 			break;
 
@@ -780,6 +786,9 @@
 
 
      case "m_add_category":
+     	$application =& kApplication::Instance();
+        $application->SetVar('c_mode', 't');
+        
          if (ValidDate($_POST['cat_date'], GetDateFormat(0, true))) {
 			$CreatedOn = DateTimestamp($_POST['cat_date'],GetDateFormat(0, true));
          }
@@ -817,12 +826,16 @@
             		}
             	}
             }
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$objCustomEdit->SaveData('c', $cat->Get('ResourceId'));
+            }
 
      break;
 
-     case "m_edit_category":
+	case "m_edit_category":
+     	$application =& kApplication::Instance();
+        $application->SetVar('c_mode', 't');
+        	
          $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat(0, true));
          $cat_pick = GetVar('cat_pick');
          $Status = (int)$_POST["status"];
@@ -878,8 +891,9 @@
             		}
             	}
          }
-         if($DataChanged)
-         	$objCustomEdit->SaveData();
+         if ($DataChanged) {
+         	$objCustomEdit->SaveData('c', $cat->Get('ResourceId'));
+         }
 
      break;
      case "m_edit_custom_data":
@@ -903,8 +917,15 @@
             		}
             	}
             }
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$db =& GetADODBConnection(true);
+            	$sql = 'SELECT Prefix
+            			FROM '.TABLE_PREFIX.'ItemTypes
+            			WHERE ItemType = '.GetVar('CustomType');
+            	$main_prefix = $db->GetOne($sql);
+            	$application->SetVar($main_prefix.'_mode', 't');
+            	$objCustomEdit->SaveData($main_prefix, $id);
+            }
 /*
      	$id = $_POST["ItemId"];
         $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData"));
@@ -2471,12 +2492,8 @@
 	    }
 
 	    $cat_ids = $objCatList->CopyFromEditTable("CategoryId");
-	    if($cat_ids)
-		{
-			$db =& GetADODBConnection();
-			$sql = 'SELECT ResourceId FROM '.$objCatList->SourceTable.' WHERE CategoryId IN ('.implode(',', $cat_ids).')';
-			$rids = $db->GetCol($sql);
-			$objCustomDataList->CopyFromEditTable("CustomDataId", $rids);
+	    if ($cat_ids) {
+			$objCustomDataList->CopyFromEditTable('c');
 		}
 	    $objCatList->Clear();
 
@@ -2490,7 +2507,7 @@
 	if( GetVar('CatEditStatus') == 2 )
 	{
 	    $objCatList->PurgeEditTable("CategoryId");
-	    $objCustomDataList->PurgeEditTable("CustomDataId");
+	    $objCustomDataList->PurgeEditTable('c');
 	  	if($_REQUEST['CategoryId'] > 0) // not root category is updated
 	    {
 	    	$objImages = new clsImageList();
@@ -2508,10 +2525,7 @@
 
 	    $user_ids = $objUsers->CopyFromEditTable("PortalUserId");
 	    if ($user_ids) {
-			$db =& GetADODBConnection();
-			$sql = 'SELECT ResourceId FROM '.$objUsers->SourceTable.' WHERE PortalUserId IN ('.implode(',', $user_ids).')';
-			$rids = $db->GetCol($sql);
-			$objCustomDataList->CopyFromEditTable("CustomDataId", $rids);
+			$objCustomDataList->CopyFromEditTable('u');
 		}
 
 	    $objGroups->Clear();
@@ -2523,7 +2537,7 @@
 		$objUserGroupsList = new clsUserGroupList();
 	    $objGroups->PurgeEditTable("PortalUserId");
 	    $objUserGroupsList->PurgeEditTable("PortalUserId");
-	    $objCustomDataList->PurgeEditTable("CustomDataId");
+	    $objCustomDataList->PurgeEditTable('u');
 	    $objGroups->Clear();
 	}