--- loncom/xml/lonxml.pm	2003/06/10 14:33:32	1.261
+++ loncom/xml/lonxml.pm	2003/06/12 20:28:14	1.263
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.261 2003/06/10 14:33:32 albertel Exp $
+# $Id: lonxml.pm,v 1.263 2003/06/12 20:28:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,7 +386,7 @@ sub fontsettings() {
     if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
 	$headerstring.=
 	    '<meta Content-Type="text/html; charset=x-mac-roman">';
-    } elsif (!$ENV{'browser.mathml'}) {
+    } elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) {
 	$headerstring.=
 	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
     }
@@ -1438,6 +1438,7 @@ sub description {
 # calls to lonnet functions for this setup.
 # - looks for form.grade_ parameters
 sub whichuser {
+  my ($passedsymb)=@_;
   my ($symb,$courseid,$domain,$name,$publicuser);
   if (defined($ENV{'form.grade_symb'})) {
     my $tmp_courseid=$ENV{'form.grade_courseid'};
@@ -1449,7 +1450,11 @@ sub whichuser {
       $name=$ENV{'form.grade_username'};
     }
   } else {
-      $symb=&Apache::lonnet::symbread();
+      if (!$passedsymb) {
+          $symb=&Apache::lonnet::symbread();
+      } else {
+          $symb=$passedsymb;
+      }
       $courseid=$ENV{'request.course.id'};
       $domain=$ENV{'user.domain'};
       $name=$ENV{'user.name'};