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

[interchange-core@icdevgroup.org]

User:      mheins
Date:      2002-10-21 15:42:11 GMT
Modified:  lib/Vend Interpolate.pm
Log:
* Fixed a couple of variable persistence problems with "more"
  lists when running in PreFork mode.

  (Recommitted after switchover, change by kwalsh)

Revision  Changes    Path
2.119     +11 -6     interchange/lib/Vend/Interpolate.pm


rev 2.119, prev_rev 2.118
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.118
retrieving revision 2.119
diff -u -r2.118 -r2.119
--- Interpolate.pm	18 Oct 2002 07:08:42 -0000	2.118
+++ Interpolate.pm	21 Oct 2002 15:42:11 -0000	2.119
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.118 2002/10/18 07:08:42 mheins Exp $
+# $Id: Interpolate.pm,v 2.119 2002/10/21 15:42:11 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.118 $, 10);
+$VERSION = substr(q$Revision: 2.119 $, 10);
 
 @EXPORT = qw (
 
@@ -3570,7 +3570,6 @@
 		$page,
 		$prefix,
 		$more_id,
-		$form_arg,
 		$session,
 		$link_template,
 		);
@@ -3653,6 +3652,9 @@
 		$more_id = $q->{mv_more_id};
 		$form_arg .= "\nmi=$more_id";
 	}
+	else {
+		$more_id = undef;
+	}
 
 	if($r =~ s:\[border\]($All)\[/border\]::i) {
 		$border = $1;
@@ -3663,9 +3665,12 @@
 		$border =~ s/\D//g;
 	}
 
-	$r =~ s:\[link[-_]template\]($All)\[/link[-_]template\]::i
-		and $link_template = $1;
-	$link_template ||= q{<A HREF="$URL$">$ANCHOR$</A>};
+	if ($r =~ s:\[link[-_]template\]($All)\[/link[-_]template\]::i) {
+		$link_template = $1;
+	}
+	else {
+		$link_template = q{<A HREF="$URL$">$ANCHOR$</A>};
+	}
 
 	if(! $chunk or $chunk >= $total) {
 		return '';