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/ACE_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/ACE_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/ACE_Overlay.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rt/lib/RT/ACE_Overlay.pm b/rt/lib/RT/ACE_Overlay.pm index 824429f6e..c3444b3be 100644 --- a/rt/lib/RT/ACE_Overlay.pm +++ b/rt/lib/RT/ACE_Overlay.pm @@ -481,7 +481,7 @@ sub _Delete { # revoke all rights delegated by the recipient. if ($val and ($self->RightName() eq 'DelegateRights' or $self->RightName() eq 'SuperUser')) { - $val = $self->PrincipalObj->_CleanupInvalidDelegations( InsideTransaction => 1 ); + $val = $self->PrincipalObj->CleanupInvalidDelegations( InsideTransaction => 1 ); } if ($val) { @@ -722,7 +722,7 @@ sub _ParseObjectArg { if( $args{'Object'} && ($args{'ObjectId'} || $args{'ObjectType'}) ) { $RT::Logger->crit( "Method called with an ObjectType or an ObjectId and Object args" ); return (); - } elsif( $args{'Object'} && !UNIVERSAL::can($args{'Object'},'id') ) { + } elsif( $args{'Object'} && ref($args{'Object'}) && !$args{'Object'}->can('id') ) { $RT::Logger->crit( "Method called called Object that has no id method" ); return (); } elsif( $args{'Object'} ) { |