X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FGroup_Overlay.pm;h=09f30822fc219f88c03dcbe019e9f3a1c566b180;hp=af47baf9ec3318de9848239e0840399d47a5d129;hb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941 diff --git a/rt/lib/RT/Group_Overlay.pm b/rt/lib/RT/Group_Overlay.pm index af47baf9e..09f30822f 100644 --- a/rt/lib/RT/Group_Overlay.pm +++ b/rt/lib/RT/Group_Overlay.pm @@ -1189,9 +1189,9 @@ sub _DeleteMember { # }}} -# {{{ sub _CleanupInvalidDelegations +# {{{ sub CleanupInvalidDelegations -=head2 _CleanupInvalidDelegations { InsideTransaction => undef } +=head2 CleanupInvalidDelegations { InsideTransaction => undef } Revokes all ACE entries delegated by members of this group which are inconsistent with their current delegation rights. Does not perform @@ -1206,12 +1206,15 @@ and logs an internal error if the deletion fails (should not happen). =cut -# XXX Currently there is a _CleanupInvalidDelegations method in both +# XXX Currently there is a CleanupInvalidDelegations method in both # RT::User and RT::Group. If the recursive cleanup call for groups is # ever unrolled and merged, this code will probably want to be # factored out into RT::Principal. -sub _CleanupInvalidDelegations { +# backcompat for 3.8.8 and before +*_CleanupInvalidDelegations = \&CleanupInvalidDelegations; + +sub CleanupInvalidDelegations { my $self = shift; my %args = ( InsideTransaction => undef, @_ ); @@ -1228,7 +1231,7 @@ sub _CleanupInvalidDelegations { $members->LimitToUsers(); $RT::Handle->BeginTransaction() unless $in_trans; while ( my $member = $members->Next()) { - my $ret = $member->MemberObj->_CleanupInvalidDelegations(InsideTransaction => 1, + my $ret = $member->MemberObj->CleanupInvalidDelegations(InsideTransaction => 1, Object => $args{Object}); unless ($ret) { $RT::Handle->Rollback() unless $in_trans;