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

[albertel]

albertel		Wed Jan 11 03:25:07 2006 EDT

  Modified files:              (Branch: version_2_1_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - backport 1.697
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.683.2.8 loncom/lonnet/perl/lonnet.pm:1.683.2.9
--- loncom/lonnet/perl/lonnet.pm:1.683.2.8	Wed Jan 11 03:07:34 2006
+++ loncom/lonnet/perl/lonnet.pm	Wed Jan 11 03:25:06 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.683.2.8 2006/01/11 08:07:34 albertel Exp $
+# $Id: lonnet.pm,v 1.683.2.9 2006/01/11 08:25:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6088,10 +6088,10 @@
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
     $thisfn=~s/^\///;
-    $thisfn=~s/^res\///;
-    $thisfn=~s/\?.+$//;
     $thisfn=~s|^adm/wrapper/||;
     $thisfn=~s|^adm/coursedocs/showdoc/||;
+    $thisfn=~s/^res\///;
+    $thisfn=~s/\?.+$//;
     return $thisfn;
 }