X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Flib%2FRT%2FRuleset.pm;h=acf1bf1e01bcc40036cc4e482058bd4dc4e90945;hb=7322f2afedcc2f427e997d1535a503613a83f088;hp=f4c986f0ed068075bbe3c4a9f9aae8e703efa8ca;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/rt/lib/RT/Ruleset.pm b/rt/lib/RT/Ruleset.pm
index f4c986f0e..acf1bf1e0 100644
--- a/rt/lib/RT/Ruleset.pm
+++ b/rt/lib/RT/Ruleset.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -50,8 +50,8 @@ package RT::Ruleset;
 use strict;
 use warnings;
 
+
 use base 'Class::Accessor::Fast';
-use UNIVERSAL::require;
 
 __PACKAGE__->mk_accessors(qw(Name Rules));
 
@@ -61,7 +61,7 @@ sub FindAllRules {
     my ($class, %args) = @_;
     return [
         grep { $_->Prepare }
-        map { $_->new(CurrentUser => $RT::SystemUser, %args) }
+        map { $_->new(CurrentUser => RT->SystemUser, %args) }
         grep { $_->_Stage eq $args{Stage} }
         map { @{$_->Rules} } @RULE_SETS
     ];
@@ -81,14 +81,6 @@ sub Add {
     push @RULE_SETS, $class->new(\%args);
 }
 
-eval "require RT::Ruleset_Vendor";
-if ($@ && $@ !~ qr{^Can't locate RT/Ruleset_Vendor.pm}) {
-    die $@;
-};
-
-eval "require RT::Ruleset_Local";
-if ($@ && $@ !~ qr{^Can't locate RT/Ruleset_Local.pm}) {
-    die $@;
-};
+RT::Base->_ImportOverlays();
 
 1;