[freeside-commits] freeside/FS/FS svc_Common.pm,1.62.2.4,1.62.2.5

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv17175/FS/FS

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	svc_Common.pm 
Log Message:
display spam status on account view, RT#15987

Index: svc_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_Common.pm,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -u -w -d -r1.62.2.4 -r1.62.2.5
--- svc_Common.pm	19 Dec 2011 01:18:10 -0000	1.62.2.4
+++ svc_Common.pm	15 Jan 2012 05:28:05 -0000	1.62.2.5
@@ -996,9 +996,8 @@
   my %defaults = ();
   my $error = $self->export('getsettings', \%settings, \%defaults);
   if ( $error ) {
-    #XXX bubble this up better
     warn "error running export_getsetings: $error";
-    return ( {}, {} );
+    return ( { 'error' => $error }, {} );
   }
   ( \%settings, \%defaults );
 }
@@ -1016,9 +1015,8 @@
   my %hash = ();
   my $error = $self->export('getstatus', \$html, \%hash);
   if ( $error ) {
-    #XXX bubble this up better
     warn "error running export_getstatus: $error";
-    return ( '', {} );
+    return ( '', { 'error' => $error } );
   }
   ( $html, \%hash );
 }