X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FRuleset.pm;h=9d6b965aab8d3d81a3a2a8f669037474cad34c06;hb=31f3763747b82764bb019cfab5b2a2945fc9a99d;hp=26848400e15b357c4607800ba1c4e674cc189764;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/lib/RT/Ruleset.pm b/rt/lib/RT/Ruleset.pm
index 26848400e..9d6b965aa 100644
--- a/rt/lib/RT/Ruleset.pm
+++ b/rt/lib/RT/Ruleset.pm
@@ -1,40 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,13 +43,14 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
 
 package RT::Ruleset;
 use strict;
 use warnings;
 
+
 use base 'Class::Accessor::Fast';
 use UNIVERSAL::require;
 
@@ -61,7 +62,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 +82,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;