no need to grab the master user more than once
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 15 Jan 2009 15:01:07 +0000 (15:01 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 15 Jan 2009 15:01:07 +0000 (15:01 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@11843 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/perlmods/OpenILS/Application/Actor.pm

index 7bc1112..8dab7b6 100644 (file)
@@ -3109,9 +3109,9 @@ sub merge_users {
     my $e = new_editor(xact => 1, authtoken => $auth);
        return $e->die_event unless $e->checkauth;
 
+    my $master_user = $e->retrieve_actor_user($master_id) or return $e->die_event;
     for my $src_id (@$user_ids) {
         my $src_user = $e->retrieve_actor_user($src_id) or return $e->die_event;
-        my $master_user = $e->retrieve_actor_user($master_id) or return $e->die_event;
 
         return $e->die_event unless $e->allowed('MERGE_USERS', $src_user->home_ou);
         if($src_user->home_ou ne $master_user->home_ou) {