--- loncom/homework/optionresponse.pm	2003/09/23 01:52:57	1.84.2.1
+++ loncom/homework/optionresponse.pm	2003/09/09 13:36:11	1.85
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.84.2.1 2003/09/23 01:52:57 albertel Exp $
+# $Id: optionresponse.pm,v 1.85 2003/09/09 13:36:11 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -303,8 +303,9 @@ sub displayfoils {
   my $break;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
   my $status=$Apache::inputtags::status[-1];
-  if ( ($target ne 'tex') &&
-       &Apache::response::show_answer() ) {
+  if (
+      ($target ne 'tex') &&
+      (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
     foreach $name (@whichopt) {
 	my $text=$Apache::response::foilgroup{$name.'.text'};
 	if ($text!~/^\s*$/) {
@@ -437,7 +438,7 @@ sub optionlist_correction {
 
     my $texoptionlist = shift;
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /;
+	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
 	$texoptionlist =~ s/<option>/\{\\bf /g;
 	$texoptionlist =~ s/<option selected="on">/\{\\bf /g;
 	$texoptionlist =~ s/<\/option>/\},/g;