projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
display spam status on account view, RT#15987
[freeside.git]
/
FS
/
FS
/
svc_Common.pm
diff --git
a/FS/FS/svc_Common.pm
b/FS/FS/svc_Common.pm
index
9137c3f
..
499afe0
100644
(file)
--- a/
FS/FS/svc_Common.pm
+++ b/
FS/FS/svc_Common.pm
@@
-996,9
+996,8
@@
sub export_getsettings {
my %defaults = ();
my $error = $self->export('getsettings', \%settings, \%defaults);
if ( $error ) {
my %defaults = ();
my $error = $self->export('getsettings', \%settings, \%defaults);
if ( $error ) {
- #XXX bubble this up better
warn "error running export_getsetings: $error";
warn "error running export_getsetings: $error";
- return ( {}, {} );
+ return ( {
'error' => $error
}, {} );
}
( \%settings, \%defaults );
}
}
( \%settings, \%defaults );
}
@@
-1016,9
+1015,8
@@
sub export_getstatus {
my %hash = ();
my $error = $self->export('getstatus', \$html, \%hash);
if ( $error ) {
my %hash = ();
my $error = $self->export('getstatus', \$html, \%hash);
if ( $error ) {
- #XXX bubble this up better
warn "error running export_getstatus: $error";
warn "error running export_getstatus: $error";
- return ( '', {} );
+ return ( '', {
'error' => $error
} );
}
( $html, \%hash );
}
}
( $html, \%hash );
}