[open-ils-commits] r11843 - trunk/Open-ILS/src/perlmods/OpenILS/Application
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Jan 15 10:01:09 EST 2009
Author: erickson
Date: 2009-01-15 10:01:07 -0500 (Thu, 15 Jan 2009)
New Revision: 11843
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
Log:
no need to grab the master user more than once
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm 2009-01-15 14:12:48 UTC (rev 11842)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm 2009-01-15 15:01:07 UTC (rev 11843)
@@ -3109,9 +3109,9 @@
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) {
More information about the open-ils-commits
mailing list