[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonmenu.pm
raeburn
raeburn@source.lon-capa.org
Mon, 18 Jan 2010 20:59:59 -0000
raeburn Mon Jan 18 20:59:59 2010 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonmenu.pm
Log:
- Backport 1.293.
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.244.2.9 loncom/interface/lonmenu.pm:1.244.2.10
--- loncom/interface/lonmenu.pm:1.244.2.9 Mon Jan 18 20:47:57 2010
+++ loncom/interface/lonmenu.pm Mon Jan 18 20:59:58 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.244.2.9 2010/01/18 20:47:57 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.10 2010/01/18 20:59:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1429,6 +1429,11 @@
unless (($env{'browser.interface'} eq 'textual') ||
($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+ if ($currenturl =~ m{^/adm/wrapper/ext/}) {
+ if ($env{'request.external.querystring'}) {
+ $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
+ }
+ }
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});