[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

albertel lon-capa-cvs-allow@mail.lon-capa.org
Thu, 07 Jun 2007 18:08:40 -0000


albertel		Thu Jun  7 14:08:40 2007 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - /res/adm/includes wasn't getting it's /res restored by clutter
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.883 loncom/lonnet/perl/lonnet.pm:1.884
--- loncom/lonnet/perl/lonnet.pm:1.883	Tue Jun  5 18:36:57 2007
+++ loncom/lonnet/perl/lonnet.pm	Thu Jun  7 14:08:39 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.883 2007/06/05 22:36:57 albertel Exp $
+# $Id: lonnet.pm,v 1.884 2007/06/07 18:08:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7648,7 +7648,8 @@
 
 sub clutter {
     my $thisfn='/'.&declutter(shift);
-    unless ($thisfn=~/^\/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)\//) { 
+    if ($thisfn !~ m{^/(uploaded|editupload|userfiles|ext|raw|priv|public)/}
+	|| $thisfn =~ m{^/adm/(includes|pages)} ) { 
        $thisfn='/res'.$thisfn; 
     }
     if ($thisfn !~m|/adm|) {