This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / FS / FS / queue.pm

diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm
index 3f8763d..99e349c 100644 (file)
--- a/FS/FS/queue.pm
+++ b/FS/FS/queue.pm
@@ -12,7 +12,7 @@ use FS::Record qw( qsearch qsearchs dbh );
 use FS::queue_arg;
 use FS::queue_depend;
 use FS::cust_svc;
-use FS::CGI qw(rooturl);
+use FS::CGI qw (rooturl);
 
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw( joblisting );
@@ -67,20 +67,6 @@ Job status (new, locked, or failed)
 
 Freeform text status message
 
-=cut
-
-sub statustext {
-  my $self = shift;
-  if ( defined ( $_[0] ) ) {
-    $self->SUPER::statustext(@_);
-  } else {
-    my $value = $self->SUPER::statustext();
-    my $rooturl = rooturl();
-    $value =~ s/%%%ROOTURL%%%/$rooturl/g; 
-    $value;
-  }
-}
-
 =item _date
 
 UNIX timestamp
@@ -377,7 +363,7 @@ If there is an error, returns the error, otherwise returns false.
 use vars qw($_update_statustext_dbh);
 sub update_statustext {
   my( $self, $statustext ) = @_;
-  return '' if $statustext eq $self->get('statustext'); #avoid rooturl expansion
+  return '' if $statustext eq $self->statustext;
   warn "updating statustext for $self to $statustext" if $DEBUG;
 
   $_update_statustext_dbh ||= myconnect;
@@ -388,7 +374,7 @@ sub update_statustext {
 
   $sth->execute($statustext, $self->jobnum) or return $sth->errstr;
   $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr;
-  $self->set('statustext', $statustext); #avoid rooturl expansion
+  $self->statustext($statustext);
   '';
 
   #my $new = new FS::queue { $self->hash };