[Rt-commit] rt branch, 4.2/remove-deprecations, updated. rt-4.0.6-458-gfcab7d5

[Alex Vandiver]

The branch, 4.2/remove-deprecations has been updated
       via  fcab7d5f79f09bfaca34c3c5ad787e132053dbfb (commit)
      from  b71b6d9bf0070248a8158681116b417e12241ac8 (commit)

Summary of changes:
 lib/RT/Principal.pm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit fcab7d5f79f09bfaca34c3c5ad787e132053dbfb
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Mar 9 14:15:21 2011 -0500

    Remove support for a global _IsOverrideGlobalACL method, last referenced in RT2

diff --git a/lib/RT/Principal.pm b/lib/RT/Principal.pm
index 4c225c4..5e65fa7 100644
--- a/lib/RT/Principal.pm
+++ b/lib/RT/Principal.pm
@@ -301,10 +301,7 @@ sub HasRight {
 
     unshift @{ $args{'EquivObjects'} },
         $args{'Object'}->ACLEquivalenceObjects;
-
-    unshift @{ $args{'EquivObjects'} }, $RT::System
-        unless $self->can('_IsOverrideGlobalACL')
-            && $self->_IsOverrideGlobalACL( $args{'Object'} );
+    unshift @{ $args{'EquivObjects'} }, $RT::System;
 
     # If we've cached a win or loss for this lookup say so
 
@@ -377,9 +374,7 @@ sub HasRights {
     push @{ $args{'EquivObjects'} }, $object;
     unshift @{ $args{'EquivObjects'} },
         $args{'Object'}->ACLEquivalenceObjects;
-    unshift @{ $args{'EquivObjects'} }, $RT::System
-        unless $self->can('_IsOverrideGlobalACL')
-            && $self->_IsOverrideGlobalACL( $object );
+    unshift @{ $args{'EquivObjects'} }, $RT::System;
 
     my %res = ();
     {

-----------------------------------------------------------------------