--- loncom/interface/londocs.pm 2004/12/10 20:46:38 1.152 +++ loncom/interface/londocs.pm 2004/12/13 01:57:10 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.152 2004/12/10 20:46:38 albertel Exp $ +# $Id: londocs.pm,v 1.155 2004/12/13 01:57:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1175,7 +1175,6 @@ END } if ($ispage) { - &Apache::lonnet::logthis(" in ispage "); my $pagename=&Apache::lonnet::escape($pagetitle); my $pagepath; my $folderpath=$ENV{'form.folderpath'}; @@ -1190,11 +1189,9 @@ END $residx, $path.$pagearg.'.page'); } - #(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); $url.='pagepath='.&Apache::lonnet::escape($pagepath). '&pagesymb='.&Apache::lonnet::escape($symb); } - &Apache::lonnet::logthis(" link \n$url"); $line.=''. "$title"; @@ -1684,7 +1681,7 @@ sub handler { # is this a standard course? my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//); - my $forcestandard; + my $forcestandard = 0; my $forcesupplement; my $script=''; my $allowed; @@ -1710,7 +1707,10 @@ sub handler { $showdoc='/'.$1; } unless ($showdoc) { # got called from remote - $forcestandard=($ENV{'form.folder'}=~/^default_/); + if (($ENV{'form.folder'}=~/^default_$/) || + ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) { + $forcestandard = 1; + } $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); # does this user have privileges to post, etc?