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

[interchange-core@icdevgroup.org]

User:      kwalsh
Date:      2002-10-19 20:48:49 GMT
Modified:  lib/Vend Interpolate.pm
Log:
	* Fixed a couple of variable persistence problems with "more"
	  lists when running in PreFork mode.

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


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