--- rat/lonwrapper.pm 2003/02/20 19:41:26 1.9 +++ rat/lonwrapper.pm 2003/03/01 03:06:37 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.9 2003/02/20 19:41:26 www Exp $ +# $Id: lonwrapper.pm,v 1.11 2003/03/01 03:06:37 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,7 +56,7 @@ sub handler { if ($url=~/^\/uploaded\//) { $url=&Apache::lonnet::tokenwrapper($url); } - $url.='?'.$ENV{'QUERY_STRING'}; #reappend the query arguments + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; #reappend the query arguments my $events='onLoad="'.&Apache::lonmenu::loadevents. '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; my $script=&Apache::lonmenu::registerurl(1,undef); @@ -81,8 +81,7 @@ ENDDOCUMENT # $r->print(''. &Apache::lonmenu::registerurl(1). - ''. - &Apache::loncommon::bodytag(). + ''. &Apache::lonmenu::menubuttons(1). &Apache::lonnet::ssi_body($url).''); }