[freeside-commits] branch master updated. 469c10dcd2bad9c12c83dbd5d4645751382628ba

[Jonathan Prykop]

The branch, master has been updated
       via  469c10dcd2bad9c12c83dbd5d4645751382628ba (commit)
      from  b36fd164c990208bb1c37f40ee1887996442f94e (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 469c10dcd2bad9c12c83dbd5d4645751382628ba
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jan 5 16:31:06 2016 -0600

    RT#39669: Version 4 installation freeside-setup error

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 978d713..1dd48cc 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -845,7 +845,7 @@ 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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)