--- loncom/interface/lonmenu.pm	2009/09/08 20:56:46	1.281
+++ loncom/interface/lonmenu.pm	2009/09/27 11:05:06	1.282
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.281 2009/09/08 20:56:46 raeburn Exp $
+# $Id: lonmenu.pm,v 1.282 2009/09/27 11:05:06 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,6 +137,7 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
 
 use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
 
@@ -1688,7 +1689,7 @@ sub roles_selector {
         }
         $role_selector .= '</select>'."\n".
                '<input type="hidden" name="destinationurl" value="'.
-               $ENV{'REQUEST_URI'}.'" />'."\n".
+               &HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n".
                '<input type="hidden" name="gotorole" value="1" />'."\n".
                '<input type="hidden" name="selectrole" value="" />'."\n".
                '<input type="hidden" name="switch" value="1" />'."\n".