[interchange-cvs] interchange - heins modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Thu Sep 23 12:39:03 EDT 2004
User: heins
Date: 2004-09-23 16:39:03 GMT
Modified: dist/standard catalog.cfg
Modified: lib/Vend Interpolate.pm
Log:
* back out removal of <!--[itl tag]--> comment strip
* add pragma no_html_comment_embed
* make default in new catalogs to not do strip
Revision Changes Path
1.4 +3 -0 interchange/dist/standard/catalog.cfg
rev 1.4, prev_rev 1.3
Index: catalog.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/standard/catalog.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catalog.cfg 16 Sep 2004 15:51:03 -0000 1.3
+++ catalog.cfg 23 Sep 2004 16:39:02 -0000 1.4
@@ -188,6 +188,9 @@
# before the HTML starts when doing 'view source' in a browser.
Pragma strip_white
+# Don't allow <!--[itl tag]-->
+Pragma no_html_comment_embed
+
#==========================================================================#
# User session related settings.
2.222 +8 -2 interchange/lib/Vend/Interpolate.pm
rev 2.222, prev_rev 2.221
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.221
retrieving revision 2.222
diff -u -r2.221 -r2.222
--- Interpolate.pm 18 Sep 2004 12:44:41 -0000 2.221
+++ Interpolate.pm 23 Sep 2004 16:39:02 -0000 2.222
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.221 2004/09/18 12:44:41 racke Exp $
+# $Id: Interpolate.pm,v 2.222 2004/09/23 16:39:02 mheins Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.221 $, 10);
+$VERSION = substr(q$Revision: 2.222 $, 10);
@EXPORT = qw (
@@ -625,6 +625,12 @@
# Translate legacy atomic [/page] and [/order] tags
$$html =~ s,\[/page(?:target)?\],</A>,ig;
$$html =~ s,\[/order\],</A>,ig;
+
+ # Translate Interchange tags embedded in HTML comments like <!--[tag ...]-->
+ ! $::Pragma->{no_html_comment_embed}
+ and
+ $$html =~ s/<!--+\[/[/g
+ and $$html =~ s/\]--+>/]/g;
}
sub interpolate_html {
More information about the interchange-cvs
mailing list