projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging RT 4.0.6
[freeside.git]
/
rt
/
lib
/
RT
/
Approval.pm
diff --git
a/rt/lib/RT/Approval.pm
b/rt/lib/RT/Approval.pm
index
50bd1fe
..
6a519c1
100644
(file)
--- a/
rt/lib/RT/Approval.pm
+++ b/
rt/lib/RT/Approval.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-50,6
+50,7
@@
package RT::Approval;
use strict;
use warnings;
use strict;
use warnings;
+
use RT::Ruleset;
RT::Ruleset->Add(
use RT::Ruleset;
RT::Ruleset->Add(
@@
-61,14
+62,6
@@
RT::Ruleset->Add(
'RT::Approval::Rule::Created',
]);
'RT::Approval::Rule::Created',
]);
-eval "require RT::Approval_Vendor";
-if ($@ && $@ !~ qr{^Can't locate RT/Approval_Vendor.pm}) {
- die $@;
-};
-
-eval "require RT::Approval_Local";
-if ($@ && $@ !~ qr{^Can't locate RT/Approval_Local.pm}) {
- die $@;
-};
+RT::Base->_ImportOverlays();
1;
1;