--- loncom/interface/loncommon.pm 2006/04/13 19:12:48 1.334 +++ loncom/interface/loncommon.pm 2006/04/13 21:02:25 1.335 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.334 2006/04/13 19:12:48 albertel Exp $ +# $Id: loncommon.pm,v 1.335 2006/04/13 21:02:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3186,6 +3186,15 @@ sub end_page { #&Apache::lonnet::logthis("end_page ".join(':',caller(0))); $env{'internal.end_page'}++; my $result; + if ($args->{'discussion'}) { + my ($target,$parser); + if (ref($args->{'discussion'})) { + ($target,$parser) =($args->{'discussion'}{'target'}, + $args->{'discussion'}{'parser'}); + } + $result .= &Apache::lonxml::xmlend($target,$parser); + } + if ($args->{'frameset'}) { $result .= ''; } else { @@ -3196,9 +3205,11 @@ sub end_page { if ($args->{'js_ready'}) { $result = &js_ready($result); } + if ($args->{'html_encode'}) { $result = &html_encode($result); } + return $result; }