[interchange-cvs] interchange - heins modified lib/Vend/Interpolate.pm

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2005-12-12 18:16:09 GMT
Modified:  lib/Vend Tag: STABLE_5_4-branch Interpolate.pm
Log:
* Prevent crash when $::Discounts not defined.

Revision  Changes    Path
No                   revision



No                   revision



2.261.2.4 +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.261.2.4, prev_rev 2.261.2.3
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.261.2.3
retrieving revision 2.261.2.4
diff -u -r2.261.2.3 -r2.261.2.4
--- Interpolate.pm	3 Dec 2005 19:31:38 -0000	2.261.2.3
+++ Interpolate.pm	12 Dec 2005 18:16:09 -0000	2.261.2.4
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.261.2.3 2005/12/03 19:31:38 mheins Exp $
+# $Id: Interpolate.pm,v 2.261.2.4 2005/12/12 18:16:09 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.261.2.3 $, 10);
+$VERSION = substr(q$Revision: 2.261.2.4 $, 10);
 
 @EXPORT = qw (
 
@@ -4991,7 +4991,7 @@
 			||= {} if $Vend::Cfg->{DiscountSpacesOn};
 	}
 
-	return $price unless $extra || %$::Discounts;
+	return $price unless $extra or $::Discounts && %$::Discounts;
 
 	$quantity = $item->{quantity};