[interchange-cvs] interchange - heins modified 2 files

[interchange-core@interchange.redhat.com]

User:      heins
Date:      2001-10-18 16:24:36 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Modified:  scripts  Tag: STABLE_4_8-branch interchange.PL
Log:
	* Fixes and good suggestions WRT restrict_html, from Kevin Walsh
	  <kevin@cursor.uk.com>. Added to both stable and devel.

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.7   +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.9.2.7, prev_rev 2.9.2.6
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.6
retrieving revision 2.9.2.7
diff -u -r2.9.2.6 -r2.9.2.7
--- Interpolate.pm	2001/10/17 17:41:24	2.9.2.6
+++ Interpolate.pm	2001/10/18 16:24:36	2.9.2.7
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.9.2.6 2001/10/17 17:41:24 mheins Exp $
+# $Id: Interpolate.pm,v 2.9.2.7 2001/10/18 16:24:36 mheins 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.6 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.7 $, 10);
 
 @EXPORT = qw (
 
@@ -1156,7 +1156,7 @@
 					my $val = shift;
 					shift;
 					my %allowed;
-					@allowed{@_} = @_;
+					$allowed{lc $_} = 1 for @_;
 					$val =~ s{<(/?(\w[-\w]*)[\s>])}
 						     { ($allowed{lc $2} ? '<' : '&lt;') . $1 }ge;
 					return $val;



No                   revision



No                   revision



2.7.2.4   +3 -2      interchange/scripts/interchange.PL


rev 2.7.2.4, prev_rev 2.7.2.3
Index: interchange.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/scripts/interchange.PL,v
retrieving revision 2.7.2.3
retrieving revision 2.7.2.4
diff -u -r2.7.2.3 -r2.7.2.4
--- interchange.PL	2001/10/13 23:10:24	2.7.2.3
+++ interchange.PL	2001/10/18 16:24:36	2.7.2.4
@@ -50,7 +50,7 @@
 #
 # Interchange version 4.8.3
 #
-# $Id: interchange.PL,v 2.7.2.3 2001/10/13 23:10:24 mheins Exp $
+# $Id: interchange.PL,v 2.7.2.4 2001/10/18 16:24:36 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -1088,9 +1088,10 @@
 			$value = Vend::Interpolate::filter_value(
 						'restrict_html',
 						$value,
-						$key,
+						undef,
 						@$restrict,
 					);
+			$::Values->{$key} = $value;
 			next;
 		}
 		$value =~ tr/<[//d;