Index: branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php
===================================================================
diff -u -r7092 -r7372
--- branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7092)
+++ branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7372)
@@ -356,7 +356,14 @@
WHERE PortalUserId = '.$object->GetDBField('PortalUserId');
$this->Conn->Query($sql);
- $group_id = $this->Application->ConfigValue('User_NewGroup');
+ // set primary group to user
+ if ($this->Application->IsAdmin() && $this->Application->GetVar('user_group')) {
+ // while in admin you can set any group for new users
+ $group_id = $this->Application->GetVar('user_group');
+ }
+ else {
+ $group_id = $this->Application->ConfigValue('User_NewGroup');
+ }
$sql = 'REPLACE INTO '.$ug_table.'(PortalUserId,GroupId,PrimaryGroup) VALUES (%s,%s,1)';
$this->Conn->Query( sprintf($sql, $object->GetID(), $group_id) );
Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r7368 -r7372
--- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7368)
+++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7372)
@@ -63,6 +63,7 @@