--- loncom/interface/lontemplate.pm	2011/05/03 21:38:40	1.45
+++ loncom/interface/lontemplate.pm	2012/05/15 22:52:56	1.45.6.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.45 2011/05/03 21:38:40 www Exp $
+# $Id: lontemplate.pm,v 1.45.6.2 2012/05/15 22:52:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,6 @@ use Apache::lontexconvert;
 use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
-use Apache::lonhtmlgateway;
 use Apache::lonmsgdisplay();
 use HTML::Entities();
 
@@ -154,14 +153,20 @@ sub print_template_fields {
 
 	foreach my $field (sort(keys(%fields))) {
 		my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
-		my $legacy = 1;
-		my $gateway = Apache::lonhtmlgateway->new($target);
-        $message = &Encode::decode('utf8', $message);		
-        $message = $gateway->process_outgoing_html($message, $legacy);
-        if ((%custom_handlers) && ($custom_handlers{$field})) {
+                if ((%custom_handlers) && ($custom_handlers{$field})) {
 			$custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed);
 		} else {
 			if (($data{$field}=~/\w/) || ($allowed)) {
+                                if (!&Apache::lonfeedback::contains_block_html($message)) {
+                                        &Apache::lonfeedback::newline_to_br(\$message);
+                                } else {
+                                        $message = &Apache::lonfeedback::tidy_html($message);
+                                }
+                                $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
+                                if ($allowed) {
+                                        $message=&Apache::lonspeller::markeduptext($message);
+                                }
+                                $message=&Apache::lontexconvert::msgtexconverted($message);
 				if ($target ne 'tex') {
 					#output of syllabusfields will be generated here. 
 					&Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box');
@@ -186,7 +191,6 @@ sub print_template_fields {
 				push(@html_ids,$field);
 			}
 		}
-		undef $gateway;
 	}
 	
 	return @html_ids;