[freeside-commits] branch FREESIDE_3_BRANCH updated. 742c6070eff7d8f3cce6901ba25c2665b9ddd938

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  742c6070eff7d8f3cce6901ba25c2665b9ddd938 (commit)
      from  18052ce1e0699474a6ac133dacf314e9c10149b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 742c6070eff7d8f3cce6901ba25c2665b9ddd938
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Feb 24 23:02:22 2015 -0800

    fix a problem running "letter" events more than once in a process, #32603

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 83d0378..cb13696 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -462,9 +462,11 @@ sub render {
 
   # Graphics/stylesheets should probably go in /var/www on the Freeside 
   # machine.
+  my $script_path = `/usr/bin/which freeside-wkhtmltopdf`;
+  chomp $script_path;
   my $kit = PDF::WebKit->new(\$html); #%options
   # hack to use our wrapper script
-  $kit->configure(sub { shift->wkhtmltopdf('freeside-wkhtmltopdf') });
+  $kit->configure(sub { shift->wkhtmltopdf($script_path) });
 
   $kit->to_pdf;
 }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/msg_template.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)