diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
| commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
| tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/lib/RT/Rule.pm | |
| parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
| parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/lib/RT/Rule.pm')
| -rw-r--r-- | rt/lib/RT/Rule.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rt/lib/RT/Rule.pm b/rt/lib/RT/Rule.pm index 675191535..bdbbe0b98 100644 --- a/rt/lib/RT/Rule.pm +++ b/rt/lib/RT/Rule.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -103,11 +103,10 @@ sub RunScripAction { my $action = $ScripAction->LoadAction( TransactionObj => $self->TransactionObj, TicketObj => $self->TicketObj, + TemplateObj => $template, %args, ); - # XXX: fix template to allow additional arguments to be passed from here - $action->{'TemplateObj'} = $template; $action->{'ScripObj'} = RT::Scrip->new($self->CurrentUser); # Stub. sendemail action really wants a scripobj available $action->Prepare or return; $action->Commit; |