--- loncom/interface/lonmenu.pm 2011/10/31 15:09:50 1.357 +++ loncom/interface/lonmenu.pm 2011/11/07 18:22:37 1.359 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.357 2011/10/31 15:09:50 raeburn Exp $ +# $Id: lonmenu.pm,v 1.359 2011/11/07 18:22:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -334,7 +334,8 @@ sub secondary_menu { and ( $env{'request.noversionuri'} eq '' || !defined($env{'request.noversionuri'}))) { - ($escurl = $env{'request.filename'}) =~ s{^/home/httpd/html}{}; + my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; + ($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; $escurl = &escape($escurl); } $menu =~ s/\[url\]/$escurl/g; @@ -493,6 +494,7 @@ sub innerregister { if (!$uploaded) { $file=~s{^(priv/$match_domain/$match_username)}{/$1}; + $file=~s{^($match_domain/$match_username)}{/priv/$1}; # Check that the user has permission to edit this resource my $setpriv = 1;