Bug 6236 : When checking for expiry don't try to process 0 dates
authorColin Campbell <colin.campbell@ptfs-europe.com>
Wed, 20 Apr 2011 16:45:38 +0000 (12:45 -0400)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 21 Apr 2011 19:35:11 +0000 (07:35 +1200)
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
C4/Serials.pm

index 1f8c170..20ae7a3 100644 (file)
@@ -1634,7 +1634,9 @@ sub HasSubscriptionExpired {
         my $sth = $dbh->prepare($query);
         $sth->execute($subscriptionid);
         my ($res) = $sth->fetchrow;
-        return 0 unless $res;
+        if (!$res || $res=~m/^0000/) {
+            return 0;
+        }
         my @res                   = split( /-/, $res );
         my @endofsubscriptiondate = split( /-/, $expirationdate );
         return 2 if ( scalar(@res) != 3 || scalar(@endofsubscriptiondate) != 3 || not check_date(@res) || not check_date(@endofsubscriptiondate) );