improve unsuspend behavior for packages on hold, #28508

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

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 1b7ac8a..4915b96 100644 (file)
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -402,26 +402,7 @@ sub qsearch {
         get_real_fields($table, $record, \@real_fields));
     }
 
-    if( defined($extra_sql) ){
-      if( $statement =~ /\sWHERE\s/i ){
-       if( $extra_sql =~ /^\s*AND /i ){
-         # correct format
-       }elsif($extra_sql =~ /^\s*WHERE /i ){
-         $extra_sql =~ s/WHERE /AND /i;
-       }else{
-         $extra_sql = " AND $extra_sql";
-       }
-      }else{
-       if( $extra_sql =~ /^\s*AND /i ){
-         $extra_sql =~ s/AND /WHERE /i;
-       }elsif($extra_sql =~ /^\s*WHERE /i ){
-         # correct format
-       }else{
-         $extra_sql = " WHERE $extra_sql";
-       }
-      }
-      $statement .= " $extra_sql";
-    }
+    $statement .= " $extra_sql" if defined($extra_sql);
     $statement .= " $order_by"  if defined($order_by);
 
     push @statement, $statement;
@@ -3341,7 +3322,7 @@ sub scalar_sql {
   defined($scalar) ? $scalar : '';
 }
 
-=item count [ WHERE ]
+=item count [ WHERE [, PLACEHOLDER ...] ]
 
 Convenience method for the common case of "SELECT COUNT(*) FROM table", 
 with optional WHERE.  Must be called as method on a class with an 
@@ -3354,7 +3335,7 @@ sub count {
   my $table = $self->table or die 'count called on object of class '.ref($self);
   my $sql = "SELECT COUNT(*) FROM $table";
   $sql .= " WHERE $where" if $where;
-  $self->scalar_sql($sql);
+  $self->scalar_sql($sql, @_);
 }
 
 =back