--- loncom/interface/londocs.pm 2011/12/21 23:23:08 1.469 +++ loncom/interface/londocs.pm 2011/12/25 18:29:49 1.471 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.469 2011/12/21 23:23:08 www Exp $ +# $Id: londocs.pm,v 1.471 2011/12/25 18:29:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1970,8 +1970,7 @@ sub entryline { if ($allowed) { my $incindex=$index+1; my $selectbox=''; - if (($folder!~/^supplemental/) && - ($#LONCAPA::map::order>0) && + if (($#LONCAPA::map::order>0) && ((split(/\:/, $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1] ne '') && @@ -2204,7 +2203,8 @@ END if ($url=~m{/adm/coursedocs}) { $line.=''; } elsif ($url) { - $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes','',600,500); + $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes', + '',600,500); } else { $line.=''; } @@ -2212,7 +2212,8 @@ END if ($url=~m{/adm/coursedocs}) { $line.=''.$title.''; } elsif ($url) { - $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes',$title,600,500); + $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes', + $title,600,500); } else { $line.=$title.' '.$reinit.''; }