summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2018-11-27 21:16:18 -0800
committerIvan Kohler <ivan@freeside.biz>2018-11-27 21:16:18 -0800
commita4c7d2df1a8e03a5bc4ee51a16734e4a255a0eb2 (patch)
tree3ed57932610b78aad19006026c6518d06f4d48ea /FS
parentc3805fd13024b3103d75b6ab2b390e72309d0144 (diff)
parent57274014205c53716c2bf0c4fb3e9ffe257e4654 (diff)
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/msg_template.pm5
1 files changed, 3 insertions, 2 deletions
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};
+
}
}