[freeside-commits] branch master updated. d0295833c7e240698bfd7b3a9bddf2024a602253

[Mark Wells]

The branch, master has been updated
       via  d0295833c7e240698bfd7b3a9bddf2024a602253 (commit)
      from  b37cafd2acd4ab2c38b44bc4d8ebde76936ef6bb (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 d0295833c7e240698bfd7b3a9bddf2024a602253
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Apr 16 21:54:54 2015 -0700

    don't try to produce plain text quotations without a template, #34460, from #31786

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index c5a416b..9e43c3c 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2093,11 +2093,20 @@ sub generate_email {
 
   if (!@text) {
 
-    warn "$me generating plain text invoice"
-      if $DEBUG;
+    if ( $conf->config($tc.'template') ) {
+
+      warn "$me generating plain text invoice"
+        if $DEBUG;
 
-    # 'print_text' argument is no longer used
-    @text = $self->print_text(\%args);
+      # 'print_text' argument is no longer used
+      @text = $self->print_text(\%args);
+
+    } else {
+
+      warn "$me no plain text version exists; sending empty message body"
+        if $DEBUG;
+
+    }
 
   }
 

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

Summary of changes:
 FS/FS/Template_Mixin.pm |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)