From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 5 Jan 2016 22:31:06 +0000 (-0600)
Subject: RT#39669: Version 4 installation freeside-setup error
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=469c10dcd2bad9c12c83dbd5d4645751382628ba

RT#39669: Version 4 installation freeside-setup error
---

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 978d71394..1dd48cc1a 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};
   
   }