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

[raeburn]

raeburn		Sat Feb 13 00:51:06 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonsimplepage.pm 
  Log:
  - Backport 1.86.
  
  
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.59.2.1 loncom/interface/lonsimplepage.pm:1.59.2.2
--- loncom/interface/lonsimplepage.pm:1.59.2.1	Wed May 20 02:37:30 2009
+++ loncom/interface/lonsimplepage.pm	Sat Feb 13 00:51:06 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.59.2.1 2009/05/20 02:37:30 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.59.2.2 2010/02/13 00:51:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -295,7 +295,9 @@
 	    if (($syllabus{$field}) || ($allowed) || 
                 ($field eq 'abb_links' && $group ne '')) {
 		my $message=$syllabus{$field};
-		&Apache::lonfeedback::newline_to_br(\$message);
+                if (!&Apache::lonfeedback::contains_block_html($message)) {
+                    &Apache::lonfeedback::newline_to_br(\$message);
+                }
 		$message
 		    =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 		if ($allowed) {