[interchange] Fix for BounceReferrals including process path

[Jon Jensen]

commit 6ba08457b75eeb6a3794421aae5902a11cad9631
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Apr 28 01:21:53 2016 -0600

    Fix for BounceReferrals including process path
    
    Originally from an internal project:
    
    Author: David Christensen <david at endpoint.com>
    Date:   Wed Jan 14 01:16:40 2009 +0000
    
        Fix for disappearing form in the BounceReferrals codepath to correct for GA issue

 lib/Vend/Dispatch.pm |    8 +++++---
 lib/Vend/Util.pm     |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/lib/Vend/Dispatch.pm b/lib/Vend/Dispatch.pm
index 68a5942..a23d8c9 100644
--- a/lib/Vend/Dispatch.pm
+++ b/lib/Vend/Dispatch.pm
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# Copyright (C) 2002-2013 Interchange Development Group
+# Copyright (C) 2002-2016 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
 #
 # This program was originally based on Vend 0.2 and 0.3
@@ -24,7 +24,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = '1.114';
+$VERSION = '1.115';
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -1629,7 +1629,9 @@ EOF
 			map { "$_=$CGI::values{$_}\n" }
 			grep { !$Vend::Cfg->{BounceReferrals_hide}->{$_} }
 			sort keys %CGI::values;
-		my $url = vendUrl($path eq '' ? $Vend::Cfg->{DirectoryIndex} : $path, undef, undef, { form => $form, match_security => 1 });
+		my $url = vendUrl($path eq '' ? $Vend::Cfg->{DirectoryIndex} : $path,
+			undef, undef,
+			{ form => $form, match_security => 1, no_default_process => 1 });
 		$url = header_data_scrub($url);
 		my $msg = get_locale_message(
 			301,
diff --git a/lib/Vend/Util.pm b/lib/Vend/Util.pm
index 783c037..d492e38 100644
--- a/lib/Vend/Util.pm
+++ b/lib/Vend/Util.pm
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# Copyright (C) 2002-2009 Interchange Development Group
+# Copyright (C) 2002-2016 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
 # This program was originally based on Vend 0.2 and 0.3
@@ -98,7 +98,7 @@ use Vend::Safe;
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.127 $, 10);
+$VERSION = '2.128';
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -1343,7 +1343,7 @@ sub vendUrl {
 
 	my $extra;
 	if($opt->{form}) {
-		$path = $Vend::Cfg->{ProcessPage} unless $path;
+		$path ||= $Vend::Cfg->{ProcessPage} unless $opt->{no_default_process};
 		if($opt->{form} eq 'auto') {
 			my $form = '';
 			while( my ($k, $v) = each %$opt) {