X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FACE_Overlay.pm;h=c3444b3bef81809ee7c18d7ced4d7cf98f0ba803;hp=824429f6e9a41382d72db92d8e952181b38ff95a;hb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941

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'} ) {