freeside/htetc global.asa,1.53,1.54

ivan ivan at pouncequick.420.am
Thu Dec 30 15:47:06 PST 2004


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

Modified Files:
	global.asa 
Log Message:
search the current dir *first*, otherwise some weird Apache::ASP bugs could crop up if things are ever named the same

Index: global.asa
===================================================================
RCS file: /home/cvs/cvsroot/freeside/htetc/global.asa,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- global.asa	30 Dec 2004 09:59:02 -0000	1.53
+++ global.asa	30 Dec 2004 23:47:03 -0000	1.54
@@ -207,15 +207,15 @@
 
 sub include {
   my $file = shift;
-  my $pop = 0;
+  my $shift = 0;
   if ( $file =~ m(^([^/].*)/[^/]+) ) {
-    push @{$Response->{asp}{includes_dir}}, "./$1";
-    $pop = 1;
+    unshift @{$Response->{asp}{includes_dir}}, "./$1";
+    $shift = 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;
+  shift @{$Response->{asp}{includes_dir}} if $shift;
   $$ref;
 }
 




More information about the freeside-commits mailing list