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

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-12-08 05:20:25 GMT
Modified:  lib/Vend Menu.pm
Log:
* Fix ordering of open paramter for trees -- it was broken by the new
  Vend::Util::vendUrl routine.

Revision  Changes    Path
2.19      +6 -6      interchange/lib/Vend/Menu.pm


rev 2.19, prev_rev 2.18
Index: Menu.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Menu.pm,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -r2.18 -r2.19
--- Menu.pm	27 Oct 2002 04:20:32 -0000	2.18
+++ Menu.pm	8 Dec 2002 05:20:24 -0000	2.19
@@ -1,6 +1,6 @@
 # Vend::Menu - Interchange payment processing routines
 #
-# $Id: Menu.pm,v 2.18 2002/10/27 04:20:32 mheins Exp $
+# $Id: Menu.pm,v 2.19 2002/12/08 05:20:24 mheins Exp $
 #
 # Copyright (C) 2002 Mike Heins, <mike@perusion.net>
 #
@@ -21,7 +21,7 @@
 
 package Vend::Menu;
 
-$VERSION = substr(q$Revision: 2.18 $, 10);
+$VERSION = substr(q$Revision: 2.19 $, 10);
 
 use Vend::Util;
 use strict;
@@ -1122,13 +1122,13 @@
 			$form = join "\n", split $Global::UrlSplittor, $form;
 		}
 
-		if($form) {
-			$form .= "\nopen=";
+		$row->{page} = Vend::Tags->area( { href => $row->{page}, form => $form });
+		if($row->{page} =~ m{\?.+=}) {
+			$row->{page} .= $Global::UrlJoiner . 'open=';
 		}
 		else {
-			$form = 'open=';
+			$row->{page} .= '?open=';
 		}
-		$row->{page} = Vend::Tags->area( { href => $row->{page}, form => $form });
 	}
 
 	my @values = @{$row}{@$fields};