--- loncom/homework/structuretags.pm	2010/01/29 15:33:02	1.444.4.4
+++ loncom/homework/structuretags.pm	2010/02/10 21:06:07	1.444.4.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.444.4.4 2010/01/29 15:33:02 raeburn Exp $
+# $Id: structuretags.pm,v 1.444.4.6 2010/02/10 21:06:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,7 +256,9 @@ sub page_start {
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
-	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+        my $uri = Apache::loncommon::inhibit_menu_check(
+                &Apache::lonenc::check_encrypt($env{'request.uri'}));
+        $uri = &HTML::Entities::encode($uri,'<>&"');
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -2051,7 +2053,7 @@ sub start_simpleeditbutton {
 #              .'</p>';
         $result .= '<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                    '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.
-                   &mt('Edit').'</a>.'</td></tr></table><br />';
+                   &mt('Edit').'</a></td></tr></table><br />';
 
     }
     return $result;