From: Mark Wells Date: Tue, 19 Jul 2016 17:00:06 +0000 (-0700) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=55c5d8f7a02622484ae97b8c195f9ce1a92a6333;hp=3bc6930e27b8ed40b11a1d1cf5d5f2cc7cba3656 Merge branch 'master' of git.freeside.biz:/home/git/freeside --- diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm index 1dd48cc1a..b89071710 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 $@;