[freeside-commits] branch master updated. 55c5d8f7a02622484ae97b8c195f9ce1a92a6333

[Mark Wells]

The branch, master has been updated
       via  55c5d8f7a02622484ae97b8c195f9ce1a92a6333 (commit)
       via  9fd904ff498395d2d72d0721646123cf22ddbae2 (commit)
      from  3bc6930e27b8ed40b11a1d1cf5d5f2cc7cba3656 (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 55c5d8f7a02622484ae97b8c195f9ce1a92a6333
Merge: 9fd904f 3bc6930
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 19 10:00:06 2016 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 9fd904ff498395d2d72d0721646123cf22ddbae2
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Jul 18 18:06:28 2016 -0700

    suppress msg_template warnings during 4.x upgrade, #21564

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 1dd48cc..b890717 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -93,6 +93,7 @@ sub extension_table { ''; } # subclasses don't HAVE to have extensions
 
 sub _rebless {
   my $self = shift;
+  return '' unless $self->msgclass;
   my $class = 'FS::msg_template::' . $self->msgclass;
   eval "use $class;";
   bless($self, $class) unless $@;

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

Summary of changes:
 FS/FS/msg_template.pm |    1 +
 1 file changed, 1 insertion(+)