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

[raeburn]

raeburn		Fri Aug 20 19:12:23 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonmsgdisplay.pm 
  Log:
  - Backport 1.51, 1.52.
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.124.4.10 loncom/interface/lonmsgdisplay.pm:1.124.4.11
--- loncom/interface/lonmsgdisplay.pm:1.124.4.10	Wed Apr 14 06:36:26 2010
+++ loncom/interface/lonmsgdisplay.pm	Fri Aug 20 19:12:22 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.124.4.10 2010/04/14 06:36:26 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.124.4.11 2010/08/20 19:12:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3150,7 +3150,7 @@
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
             if ($toaddr{$address}) {
-	        $msgtxt.='<hr />'.$toaddr{$address};
+	        $msgtxt.="\n".'<hr />'."\n".$toaddr{$address};
             }
 	    my @thismsg;
 	    if ($msgtype eq 'critical') {
@@ -3275,6 +3275,9 @@
                 $r->print($message);
             }
         }
+    } else {
+        &printheader($r,'','Messages cancelled.');
+        return 'cancelled';
     }
     return $sendstatus;
 }