From 0c89e96de16c18727dc718bfecf709a81f21fcb9 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 15 Jan 2009 15:01:07 +0000 Subject: [PATCH] no need to grab the master user more than once git-svn-id: svn://svn.open-ils.org/ILS/trunk@11843 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Actor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index 7bc1112fc0..8dab7b6e0b 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -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) { -- 2.11.0