--- rat/lonwrapper.pm	2003/09/29 16:09:21	1.14
+++ rat/lonwrapper.pm	2004/04/01 18:14:24	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.14 2003/09/29 16:09:21 www Exp $
+# $Id: lonwrapper.pm,v 1.15 2004/04/01 18:14:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,6 +54,8 @@ sub handler {
                                           ['wrapperdisplay']);
   my $orgurl=$r->uri;
   my $url=$orgurl;
+  $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+  $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';
   $url=~s/^\/adm\/wrapper//;
   $url=~s/^\/ext\//http\:\/\//;
   if ($ENV{'form.wrapperdisplay'} eq 'menu') {
@@ -76,9 +78,6 @@ sub handler {
 #
 # This is not homework
 #
-	  if ($url=~/^\/uploaded\//) {
-	      $url=&Apache::lonnet::tokenwrapper($url);
-	  }
 	  $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; 
                                                  # reappend the query arguments
 	  my $events='onLoad="'.&Apache::lonmenu::loadevents.
@@ -104,7 +103,7 @@ sub handler {
 $script
 </head>
 <frameset rows="180,*" border=0 $events>
-<frame src="$orgurl?wrapperdisplay=menu">
+<frame src="$orgurl">
 <frame src="$url">
 </frameset>
 </html>