--- loncom/interface/lonhelp.pm	2003/09/22 04:14:04	1.10
+++ loncom/interface/lonhelp.pm	2003/12/15 19:46:13	1.12
@@ -36,6 +36,7 @@ use Apache::loncommon();
 use Apache::lonacc();
 use Apache::lontexconvert();
 use Apache::lonnavmaps; # for advancedUser
+use Apache::lonlocal;
 use tth();
 use GDBM_File();
 
@@ -141,8 +142,8 @@ sub handler
      my $docroot = $r->dir_config('lonDocRoot');
      my $serverroot = $ENV{'HTTP_HOST'};
 
-     my $filenames = substr ($ENV{'REQUEST_URI'} , 
-			    rindex($ENV{'REQUEST_URI'}, '/') + 1, -4);
+     my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
+			    rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
      
      # Security check on the file; the whole filename must consist
      # of nothing but alphanums, ' ,, or ., or the file
@@ -162,9 +163,10 @@ sub handler
      my @files = split(/,/, $filenames);
      
      for my $filename (@files) {
-	 if (-e $docroot.'/adm/help/tex/'.$filename.'_'.
-	     &Apache::lonlocal::current_language().'.tex') {
-	     $filename.='_'.&Apache::lonlocal::current_language();
+	 if (-e $docroot.'/adm/help/tex/'.
+	     &Apache::lonlocal::current_language().'/'.
+	     $filename.'.tex') {
+	     $filename=&Apache::lonlocal::current_language().'/'.$filename;
 	 }
 	 (my $file = Apache::File->new($docroot
 			   . '/adm/help/tex/'.$filename.'.tex'))