--- loncom/interface/lonmenu.pm 2011/10/21 19:26:23 1.353 +++ loncom/interface/lonmenu.pm 2011/10/30 22:15:20 1.355 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.353 2011/10/21 19:26:23 www Exp $ +# $Id: lonmenu.pm,v 1.355 2011/10/30 22:15:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -334,9 +334,7 @@ sub secondary_menu { and ( $env{'request.noversionuri'} eq '' || !defined($env{'request.noversionuri'}))) { - ($escurl = $env{'request.filename'}) =~ - s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2}; - + ($escurl = $env{'request.filename'}) =~ s{^/home/httpd/html}{}; $escurl = &escape($escurl); } $menu =~ s/\[url\]/$escurl/g; @@ -577,9 +575,9 @@ sub innerregister { # We are in construction space # - + my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; my ($udom,$uname,$thisdisfn) = - ($env{'request.filename'}=~m|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$|); + ($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { $is_const_dir = 1;