--- loncom/homework/rankresponse.pm	2012/10/12 12:45:46	1.68
+++ loncom/homework/rankresponse.pm	2014/05/05 17:40:54	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.68 2012/10/12 12:45:46 raeburn Exp $
+# $Id: rankresponse.pm,v 1.71 2014/05/05 17:40:54 bisitz Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -335,8 +335,11 @@ sub format_prior_answer {
     my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
     my $output;
     foreach my $name (@{ $foil_order }) {
-	next if (!defined($lastresponse{$name}));
-	$output .= '<tr><td>'.$lastresponse{$name}.'</td></tr>';
+        if (defined($lastresponse{$name})) {
+            $output .= '<tr><td>'.&HTML::Entities::encode($lastresponse{$name},'<>&"').'</td></tr>';
+        } else {
+            $output .= '<tr><td>&nbsp;</td></tr>';
+        }
     }
     return if (!defined($output));
     $output =
@@ -377,8 +380,17 @@ sub displayfoils {
                 $newvariation = 1;
             }
         }
-        unless (((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) || $newvariation) {
-            $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        unless ($newvariation) {
+            if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+                (($env{'form.grade_username'} eq $env{'user.name'}) &&
+                 ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+            } else {
+                unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+                        ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+                    $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+                }
+            }
         }
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
 	my @alp = splice @alphabet, 0, $#whichopt + 1;