From: ivan <ivan>
Date: Tue, 2 Jan 2007 21:06:27 +0000 (+0000)
Subject: fix num_pkgs to accept empty $sql param, no trailing AND
X-Git-Tag: TRIXBOX_2_6~782
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=c7727be6391c2b48fe520edbc8df88a7762ac30c

fix num_pkgs to accept empty $sql param, no trailing AND
---

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 32da745fe..9038d95a8 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1641,8 +1641,9 @@ sub num_ncancelled_pkgs {
 
 sub num_pkgs {
   my( $self, $sql ) = @_;
+  $sql = "AND $sql" if $sql && $sql !~ /^\s*$/ && $sql !~ /^\s*AND/i
   my $sth = dbh->prepare(
-    "SELECT COUNT(*) FROM cust_pkg WHERE custnum = ? AND $sql"
+    "SELECT COUNT(*) FROM cust_pkg WHERE custnum = ? $sql"
   ) or die dbh->errstr;
   $sth->execute($self->custnum) or die $sth->errstr;
   $sth->fetchrow_arrayref->[0];