[LON-CAPA-cvs] cvs: loncom /xml scripttag.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 15 Apr 2004 20:24:34 -0000


albertel		Thu Apr 15 16:24:34 2004 EDT

  Modified files:              
    /loncom/xml	scripttag.pm 
  Log:
  - throw away the body of a <script> when parsing for meta, seems like it only screws things up, (BUG#2867)
  
  
Index: loncom/xml/scripttag.pm
diff -u loncom/xml/scripttag.pm:1.111 loncom/xml/scripttag.pm:1.112
--- loncom/xml/scripttag.pm:1.111	Mon Apr 12 19:01:57 2004
+++ loncom/xml/scripttag.pm	Thu Apr 15 16:24:34 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.111 2004/04/12 23:01:57 albertel Exp $
+# $Id: scripttag.pm,v 1.112 2004/04/15 20:24:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,11 +137,11 @@
 	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }
   } else {
-    if ($target ne "meta") {
-      $result = $token->[4];
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
-      $result.=$bodytext;
-    }
+      if ($target ne "meta") {
+	  $result = $token->[4];
+	  $result.=$bodytext;
+      }
   }
   return $result;
 }