[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonmsgdisplay.pm

[raeburn]

raeburn		Mon Feb 15 03:37:59 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - Backport 1.139.
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.124.4.8 loncom/interface/lonmsgdisplay.pm:1.124.4.9
--- loncom/interface/lonmsgdisplay.pm:1.124.4.8	Sat Jan 30 22:28:20 2010
+++ loncom/interface/lonmsgdisplay.pm	Mon Feb 15 03:37:59 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.8 2010/01/30 22:28:20 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.9 2010/02/15 03:37:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1838,7 +1838,9 @@
     foreach my $key (sort(keys(%records))) {
         my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
-	&Apache::lonfeedback::newline_to_br(\$content{'message'});
+        if (!&Apache::lonfeedback::contains_block_html($content{'message'})) {
+            &Apache::lonfeedback::newline_to_br(\$content{'message'});
+        }
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {