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

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Sun Oct 7 08:57:02 2001


User:      racke
Date:      2001-10-07 12:56:34 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Log:
merged changes 2.15 vs 2.16

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.2   +10 -2     interchange/lib/Vend/Interpolate.pm


rev 2.9.2.2, prev_rev 2.9.2.1
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.1
retrieving revision 2.9.2.2
diff -u -r2.9.2.1 -r2.9.2.2
--- Interpolate.pm	2001/09/28 22:44:22	2.9.2.1
+++ Interpolate.pm	2001/10/07 12:56:32	2.9.2.2
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.9.2.1 2001/09/28 22:44:22 mheins Exp $
+# $Id: Interpolate.pm,v 2.9.2.2 2001/10/07 12:56:32 racke Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.9.2.1 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.2 $, 10);
 
 @EXPORT = qw (
 
@@ -488,6 +488,10 @@
 	my ($name, @post);
 	my ($bit, %post);
 
+	# static page building should be independent from secure mode
+	my $secure = $CGI::secure;
+	$CGI::secure = 0;
+	
 	$CacheInvalid = 0;
 
 	vars_and_comments(\$html);
@@ -509,6 +513,10 @@
 	$CacheInvalid++ if $parse->{INVALID};
 	$Vend::CachePage = $CacheInvalid ? undef : 1;
 	$complete = \$full if $full;
+
+	# restore secure mode
+	$CGI::secure = $secure;
+	
 	if (defined $Vend::BuildingPages) {
 		return $full if $full;
 		return $parse->{OUT};