Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r15370 -r15541 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15370) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15541) @@ -1,6 +1,6 @@ Load($id); - $status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField')); + $status_field = $user_dummy->getStatusField(); if ( $user_dummy->GetDBField($status_field) != STATUS_ACTIVE ) { // not active user is not allowed to update his record (he could not activate himself manually) @@ -1198,7 +1198,7 @@ /* @var $user_dummy kDBItem */ $user_dummy->Load($id); - $status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') ); + $status_field = $user_dummy->getStatusField(); if ( $user_dummy->GetDBField($status_field) != STATUS_ACTIVE ) { // not active user is not allowed to update his record (he could not activate himself manually) @@ -1669,15 +1669,15 @@ $this->clearSelectedIDs($event); $dst_field = $this->Application->RecallVar('dst_field'); - if ($dst_field != 'PrimaryGroupId') { - return ; + if ( $dst_field != 'PrimaryGroupId' ) { + return; } - $group_ids = $this->Application->GetVar('g'); - $primary_group_id = $group_ids ? array_shift( array_keys($group_ids) ) : false; + $group_ids = array_keys($this->Application->GetVar('g')); + $primary_group_id = $group_ids ? array_shift($group_ids) : false; - if (!$user_ids || !$primary_group_id) { - return ; + if ( !$user_ids || !$primary_group_id ) { + return; } $table_name = $this->Application->getUnitOption('ug', 'TableName');