--- loncom/interface/lonmenu.pm	2009/10/16 23:35:08	1.291
+++ loncom/interface/lonmenu.pm	2009/10/20 01:57:42	1.293
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.291 2009/10/16 23:35:08 raeburn Exp $
+# $Id: lonmenu.pm,v 1.293 2009/10/20 01:57:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,7 @@ sub primary_menu {
         } else {
             if (ref($menuitem) eq 'ARRAY') { 
                 my @items = @{$menuitem};
-                $items[0] = 'javascript:'.$menuitem;
+                $items[0] = 'javascript:'.$menuitem->[0].';';
                 $menu .= &prep_menuitem(\@items);
             }
         }
@@ -1519,6 +1519,11 @@ sub utilityfunctions {
             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'});