[freeside-commits] branch FREESIDE_3_BRANCH updated. 57274014205c53716c2bf0c4fb3e9ffe257e4654

[Mitch Jackson]

The branch, FREESIDE_3_BRANCH has been updated
       via  57274014205c53716c2bf0c4fb3e9ffe257e4654 (commit)
      from  5749847c1d8a05f605127e7e0601ca17ea0bf996 (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 57274014205c53716c2bf0c4fb3e9ffe257e4654
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Tue Nov 27 18:28:30 2018 -0500

    RT# 38217 Fix msg_template freeside-upgrade bug

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 13c8d9c49..3b7c3aa84 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -929,8 +929,9 @@ sub _populate_initial_data { #class method
     die $error if $error;
 
     $conf->set( $hash->{_conf}, $msg_template->msgnum ) if $hash->{_conf};
-    FS::upgrade_journal->set_done( $hash->{_upgrade_journal} );
-  
+    FS::upgrade_journal->set_done( $hash->{_upgrade_journal} )
+      if $hash->{_upgrade_journal};
+
   }
 
 }

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

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