projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when canceling services across multiple packages, transaction-protect each one separa...
[freeside.git]
/
FS
/
FS
/
msg_template.pm
diff --git
a/FS/FS/msg_template.pm
b/FS/FS/msg_template.pm
index
978d713
..
b890717
100644
(file)
--- 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;
sub _rebless {
my $self = shift;
+ return '' unless $self->msgclass;
my $class = 'FS::msg_template::' . $self->msgclass;
eval "use $class;";
bless($self, $class) unless $@;
my $class = 'FS::msg_template::' . $self->msgclass;
eval "use $class;";
bless($self, $class) unless $@;
@@
-845,7
+846,7
@@
sub _populate_initial_data { #class method
die $error if $error;
$conf->set( $hash->{_conf}, $msg_template->msgnum ) if $hash->{_conf};
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}
;
}
}