freeside/htetc global.asa,1.52,1.53

ivan ivan at pouncequick.420.am
Thu Dec 30 01:59:05 PST 2004


Update of /home/cvs/cvsroot/freeside/htetc
In directory pouncequick:/tmp/cvs-serv20582

Modified Files:
	global.asa 
Log Message:
kludge to fix nested includes with Apache::ASP... dunno how much longer i want to support that, should just switch to Mason

Index: global.asa
===================================================================
RCS file: /home/cvs/cvsroot/freeside/htetc/global.asa,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- global.asa	2 Dec 2004 09:59:48 -0000	1.52
+++ global.asa	30 Dec 2004 09:59:02 -0000	1.53
@@ -206,9 +206,16 @@
 }
 
 sub include {
-  ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
+  my $file = shift;
+  my $pop = 0;
+  if ( $file =~ m(^([^/].*)/[^/]+) ) {
+    push @{$Response->{asp}{includes_dir}}, "./$1";
+    $pop = 1;
+  }
+  $file =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
   #broken in 5.005# ${$Response->TrapInclude($file, @_)};
   my $ref = $Response->TrapInclude($file, @_);
+  pop @{$Response->{asp}{includes_dir}} if $pop;
   $$ref;
 }
 




More information about the freeside-commits mailing list