--- loncom/homework/inputtags.pm	2007/05/21 22:57:17	1.224
+++ loncom/homework/inputtags.pm	2007/05/21 23:09:57	1.225
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.224 2007/05/21 22:57:17 albertel Exp $
+# $Id: inputtags.pm,v 1.225 2007/05/21 23:09:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -637,9 +637,6 @@ sub decideoutput {
 		    &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
 		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	    }
-	    &Apache::lonnet::logthis(" er \n$symb\n$message\n".$env{'course.'.
-			     $env{'request.course.id'}.
-			     '.disable_receipt_display'});
 	}
 	$button=0;
 	$previousmsg='';
@@ -1185,10 +1182,13 @@ sub previous_tries {
 	    my $previous = $count_lookup{$which};
 	    $message =~ s{(</td>)}{ as submission # $previous $1};
 	} elsif ($Apache::lonhomework::history{"$prefix.tries"}) {
-	    if ( $Apache::lonhomework::history{"$prefix.solved"} =~ 
-		 /^correct/) {
+	    if (!(lc($Apache::lonhomework::problemstatus) eq 'no'
+		  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER')
+		&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/
+		) {
+		
 		$message =~ s{(<td.*?>)(.*?)(</td>)}
-		             {$1 <strong>Correct</strong>. $3};
+		             {$1 <strong>Correct</strong>. $3}s;
 	    }
 	    my $trystr = "(Try ".
 		$Apache::lonhomework::history{"$prefix.tries"}.')';