X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FACL_Overlay.pm;fp=rt%2Flib%2FRT%2FACL_Overlay.pm;h=d645e40635784b00a869853a34fb16b324b6b6cb;hb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;hp=1329df07cc8a8ce0d02672446b61c7ef334e8f7f;hpb=2dfda73eeb3eae2d4f894099754794ef07d060dd;p=freeside.git diff --git a/rt/lib/RT/ACL_Overlay.pm b/rt/lib/RT/ACL_Overlay.pm index 1329df07c..d645e4063 100644 --- a/rt/lib/RT/ACL_Overlay.pm +++ b/rt/lib/RT/ACL_Overlay.pm @@ -1,8 +1,8 @@ # BEGIN BPS TAGGED BLOCK {{{ # # COPYRIGHT: -# -# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC +# +# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -45,6 +45,7 @@ # those contributions and any derivatives thereof. # # END BPS TAGGED BLOCK }}} + =head1 NAME RT::ACL - collection of RT ACE objects @@ -59,11 +60,6 @@ my $ACL = new RT::ACL($CurrentUser); =head1 METHODS -=begin testing - -ok(require RT::ACL); - -=end testing =cut @@ -318,7 +314,7 @@ sub _DoSearch { my $self = shift; # $RT::Logger->debug("Now in ".$self."->_DoSearch"); my $return = $self->SUPER::_DoSearch(@_); - # $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return\n"); + # $RT::Logger->debug("In $self ->_DoSearch. return from SUPER::_DoSearch was $return"); $self->_BuildHash(); return ($return); } @@ -329,7 +325,8 @@ sub _BuildHash { my $self = shift; while (my $entry = $self->Next) { - my $hashkey = $entry->ObjectType . "-" . $entry->ObjectId . "-" . $entry->RightName . "-" . $entry->PrincipalId . "-" . $entry->PrincipalType; + my $hashkey = join '-', map $entry->__Value( $_ ), + qw(ObjectType ObjectId RightName PrincipalId PrincipalType); $self->{'as_hash'}->{"$hashkey"} =1;