[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Mon May 28 22:10:03 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1080.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.5 loncom/interface/loncommon.pm:1.1075.2.6
--- loncom/interface/loncommon.pm:1.1075.2.5	Thu May 24 23:41:50 2012
+++ loncom/interface/loncommon.pm	Mon May 28 22:10:03 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.5 2012/05/24 23:41:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.6 2012/05/28 22:10:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5165,7 +5165,10 @@
 
 sub endbodytag {
     my ($args) = @_;
-    my $endbodytag='</body>';
+    my $endbodytag;
+    unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
+        $endbodytag='</body>';
+    }
     $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
@@ -7396,7 +7399,9 @@
     } else {
 	$result .= &endbodytag($args);
     }
-    $result .= "\n</html>";
+    unless ($args->{'notbody'}) {
+        $result .= "\n</html>";
+    }
 
     if ($args->{'js_ready'}) {
 	$result = &js_ready($result);