diff options
| author | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-18 23:15:19 +0000 |
| commit | b5c4237a34aef94976bc343c8d9e138664fc3984 (patch) | |
| tree | ba7cb2c13c199b1012c661fcf4f248e7b7e3d36f /rt/lib/RT/Group_Overlay.pm | |
| parent | 96a0d937cdfe26d691e59139088e33e0bc3e1184 (diff) | |
| parent | 75162bb14b3e38d66617077843f4dfdcaf09d5c4 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r11022,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/lib/RT/Group_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Group_Overlay.pm | 13 |
1 files changed, 8 insertions, 5 deletions
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; |