[Rt-commit] r10593 - rt/branches/3.999-DANGEROUS/lib/RT/Model

[ruz at bestpractical.com]

Author: ruz
Date: Wed Jan 30 16:50:17 2008
New Revision: 10593

Modified:
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm

Log:
* fix merge bugs, so global rights work again

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm	Wed Jan 30 16:50:17 2008
@@ -346,6 +346,11 @@
 
     }
 
+    unshift @{ $args{'equiv_objects'} }, RT->system
+                unless $self->can('_is_override_global_acl')
+                    && $self->_is_override_global_acl( $args{'object'} );
+
+
     # {{{ If we've cached a win or loss for this lookup say so
 
 # Construct a hashkeys to cache decisions: