[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

[albertel]

albertel		Wed Feb  2 14:24:45 2005 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - BUG#3886 - currentURL should be versioned
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.142 loncom/interface/lonmenu.pm:1.143
--- loncom/interface/lonmenu.pm:1.142	Mon Jan 31 14:24:02 2005
+++ loncom/interface/lonmenu.pm	Wed Feb  2 14:24:45 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.142 2005/01/31 19:24:02 albertel Exp $
+# $Id: lonmenu.pm,v 1.143 2005/02/02 19:24:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -979,7 +979,8 @@
     my $caller = shift;
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
-    my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});
+    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
+    $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
     my $nav_control=&nav_control_js();