This commit was generated by cvs2svn to compensate for changes in r11022,

[freeside.git] / rt / lib / RT / Action.pm

diff --git a/rt/lib/RT/Action.pm b/rt/lib/RT/Action.pm
index cd1f4c8..cb1eecc 100755 (executable)
--- a/rt/lib/RT/Action.pm
+++ b/rt/lib/RT/Action.pm
@@ -204,6 +204,17 @@ sub IsApplicable  {
 }
 # }}}
 
+sub Options {
+  my $self = shift;
+  return();
+}
+
+sub Rules {
+  my $self = shift;
+  return () if !$self->ScripObj or !$self->ScripObj->ActionRules;
+  return(split "\n", $self->ScripObj->ActionRules);
+}
+
 # {{{ sub DESTROY
 sub DESTROY {
     my $self = shift;
@@ -219,6 +230,9 @@ sub DESTROY {
 
 # }}}
 
-RT::Base->_ImportOverlays();
+eval "require RT::Action_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action_Vendor.pm});
+eval "require RT::Action_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action_Local.pm});
 
 1;