[interchange-cvs] interchange - kwalsh modified lib/Vend/Util.pm

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2006-11-15 15:39:41 GMT
Modified:  lib/Vend Util.pm
Log:
    * Make sure the "convert" parameter is set correctly, even if the tag
      is called from the recently modified [price] tag.

Revision  Changes    Path
2.99      +3 -2      interchange/lib/Vend/Util.pm


rev 2.99, prev_rev 2.98
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -r2.98 -r2.99
--- Util.pm	11 Oct 2006 22:10:48 -0000	2.98
+++ Util.pm	15 Nov 2006 15:39:41 -0000	2.99
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.98 2006/10/11 22:10:48 kwalsh Exp $
+# $Id: Util.pm,v 2.99 2006/11/15 15:39:41 kwalsh Exp $
 # 
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -88,7 +88,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.98 $, 10);
+$VERSION = substr(q$Revision: 2.99 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -463,6 +463,7 @@
 sub currency {
 	my($amount, $noformat, $convert, $opt) = @_;
 	$opt = {} unless $opt;
+	$convert ||= $opt->{convert};
 
 	my $pd = $Vend::Cfg->{PriceDivide};
 	if($opt->{locale}) {