[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm

[raeburn]

raeburn		Sun Aug 18 17:32:28 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.561.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.38 loncom/interface/londocs.pm:1.484.2.39
--- loncom/interface/londocs.pm:1.484.2.38	Sat Aug 17 00:59:32 2013
+++ loncom/interface/londocs.pm	Sun Aug 18 17:32:28 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.38 2013/08/17 00:59:32 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.39 2013/08/18 17:32:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -410,6 +410,8 @@
     unless ($fatal) {
         if ($folder =~ /^supplemental/) {
             &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                            $folder.'.'.$container);
         }
     }
     return ($errtext,$fatal,$fixuperrors);
@@ -4183,9 +4185,9 @@
 # supplementalflag=0: show standard documents
 # toolsflag=1: show utilities
 
-    $env{'form.folderpath'} = &unescape($env{'form.folderpath'});
-    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
+    my $unesc_folderpath = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
+    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }