Index: trunk/kernel/include/portalgroup.php =================================================================== diff -u -r923 -r955 --- trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 923) +++ trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 955) @@ -115,21 +115,14 @@ return true; } - function AddUser($UserId,$PrimaryGroup=0,$table='', $edit_table = true) + function AddUser($UserId,$PrimaryGroup=0,$edit_table = true) { global $objSession; // add user to group OR just updates it's status there $db =& $this->adodbConnection; + $table=$edit_table?$objSession->GetEditTable('UserGroup'):GetTablePrefix().'UserGroup'; - if ($edit_table) { - $table = $objSession->GetEditTable("UserGroup");//GetTablePrefix().'UserGroup'; - } - else { - $table = GetTablePrefix()."UserGroup"; - } - - if(!$table) $table=$objSession->GetEditTable("UserGroup"); $group_id = $this->Get('GroupId'); $sql_patterns['check'] = 'SELECT PortalUserId FROM %s WHERE GroupId = %s AND PortalUserId = %s'; Index: trunk/kernel/frontaction.php =================================================================== diff -u -r943 -r955 --- trunk/kernel/frontaction.php (.../frontaction.php) (revision 943) +++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 955) @@ -233,7 +233,7 @@ } if($bExists) { - $g->AddUser($u->Get("PortalUserId")); + $g->AddUser($u->Get("PortalUserId"),0,false); } else { @@ -245,7 +245,7 @@ if(!$u->CheckBanned()) { $u->Create(); - $g->AddUser($u->Get("PortalUserId"),1); + $g->AddUser($u->Get("PortalUserId"),1,false); } else $SubscribeResult = "lu_subscribe_banned"; @@ -413,7 +413,7 @@ if($GroupId>0) { $g = $objGroups->GetItem($GroupId); - $g->AddUser($u->Get("PortalUserId"),1, '', false); + $g->AddUser($u->Get("PortalUserId"),1,false); } $custom = $_POST["custom"]; Index: trunk/kernel/action.php =================================================================== diff -u -r952 -r955 --- trunk/kernel/action.php (.../action.php) (revision 952) +++ trunk/kernel/action.php (.../action.php) (revision 955) @@ -204,7 +204,7 @@ foreach($users as $user_id) { $u = $objUsers->GetItemByField("ResourceId", $user_id); - $g->AddUser($u->Get("PortalUserId"), 1,GetTablePrefix().'UserGroup'); + $g->AddUser($u->Get("PortalUserId"),1,false); } break;