[interchange-cvs] interchange - racke modified 2 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed May 21 07:20:01 2003
User: racke
Date: 2003-05-21 11:19:57 GMT
Modified: . WHATSNEW
Modified: lib/Vend Interpolate.pm
Log:
remove path_adjust Pragma which is only useful in conjunction with
StaticPath configuration directive
Revision Changes Path
2.123 +2 -0 interchange/WHATSNEW
rev 2.123, prev_rev 2.122
Index: WHATSNEW
===================================================================
RCS file: /anon_cvs/repository/interchange/WHATSNEW,v
retrieving revision 2.122
retrieving revision 2.123
diff -u -r2.122 -r2.123
--- WHATSNEW 15 May 2003 12:36:40 -0000 2.122
+++ WHATSNEW 21 May 2003 11:19:57 -0000 2.123
@@ -907,6 +907,8 @@
-- remove InvalidateCache attribute from usertags
-- remove build flag from [tag] usertag
-- remove UI pages (regen and regenerate)
+ -- remove path_adjust Pragma which is only useful in conjunction with
+ StaticPath configuration directive
-- remove Vend::Interpolate::cache_html, Vend::Interpolate::resolve_static,
Vend::Session::tie_static_dbm routines
2.169 +2 -15 interchange/lib/Vend/Interpolate.pm
rev 2.169, prev_rev 2.168
Index: Interpolate.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.168
retrieving revision 2.169
diff -u -r2.168 -r2.169
--- Interpolate.pm 15 May 2003 12:25:19 -0000 2.168
+++ Interpolate.pm 21 May 2003 11:19:57 -0000 2.169
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.168 2003/05/15 12:25:19 racke Exp $
+# $Id: Interpolate.pm,v 2.169 2003/05/21 11:19:57 racke 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.168 $, 10);
+$VERSION = substr(q$Revision: 2.169 $, 10);
@EXPORT = qw (
@@ -466,19 +466,6 @@
$1 . $dir . $2#ige;
$$text =~ s#(<t(?:[dhr]|able)\s+[^>]*?background=")(?!\w+:)([^/'][^"]+)#
$1 . $dir . $2#ige;
- }
- }
-
- if ( $::Pragma->{path_adjust} ) {
- my $dir = $Vend::Cfg->{StaticPath};
-#::logDebug("have a dir for path_adjust, $dir");
- if ($dir) {
- $$text =~ s{(<a(?:rea)?\s+[^>]*?href=)"(/[^"]+)"} {$1'$dir$2'}ig;
- $$text =~ s{(<link\s+[^>]*?href=)"(/[^"]+)"} {$1'$dir$2'}ig;
- $$text =~ s{(<i\w+\s+[^>]*?src=)"(/[^"]*)"} {$1'$dir$2'}ig;
- $$text =~ s{(<body\s+[^>]*?background=)"(/[^"]+)"}{$1'$dir$2'}ig;
- $$text =~ s{(<t(?:[dhr]|able)\s+[^>]*?background=)"(/[^"]+)"}
- {$1'$dir$2'}ig;
}
}