--- loncom/homework/lonhomework.pm	2004/03/09 20:37:58	1.171
+++ loncom/homework/lonhomework.pm	2004/04/16 19:10:27	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.171 2004/03/09 20:37:58 albertel Exp $
+# $Id: lonhomework.pm,v 1.173 2004/04/16 19:10:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -564,7 +564,7 @@ sub editxmlmode {
             <hr />
             ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	    &HTML::Entities::encode($problem).'</textarea>
+	    &HTML::Entities::encode($problem,'<>&"').'</textarea>
             </form></body></html>';
 	&Apache::lonxml::add_messages(\$result);
 	$request->print($result);
@@ -753,7 +753,8 @@ sub handler {
     #check if we know where we are
     if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
-	if ($Apache::lonhomework::browse ne 'F') {
+	if ($Apache::lonhomework::browse ne 'F' && 
+	    $ENV{'request.state'} ne "construct") {
 	    #should know where we are, so ask
 	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 		&Apache::lonnet::cleanenv();