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

[interchange-core@icdevgroup.org]

User:      jon
Date:      2003-01-23 19:32:16 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Log:
Merge from trunk:

* Fix a variable persistence problem with "more" lists when running in
  PreFork mode.

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.24  +5 -3      interchange/lib/Vend/Interpolate.pm


rev 2.9.2.24, prev_rev 2.9.2.23
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.23
retrieving revision 2.9.2.24
diff -u -u -r2.9.2.23 -r2.9.2.24
--- Interpolate.pm	23 Jan 2003 19:19:30 -0000	2.9.2.23
+++ Interpolate.pm	23 Jan 2003 19:32:15 -0000	2.9.2.24
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.9.2.23 2003/01/23 19:19:30 jon Exp $
+# $Id: Interpolate.pm,v 2.9.2.24 2003/01/23 19:32:15 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.9.2.23 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.24 $, 10);
 
 @EXPORT = qw (
 
@@ -4090,7 +4090,6 @@
 		$page,
 		$prefix,
 		$more_id,
-		$form_arg,
 		$session,
 		);
 
@@ -4156,6 +4155,9 @@
 	if($q->{mv_more_id}) {
 		$more_id = $q->{mv_more_id};
 		$form_arg .= "\nmi=$more_id";
+	}
+	else {
+		$more_id = undef;
 	}
 
 	if($r =~ s:\[border\]($All)\[/border\]::i) {