[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm /lonnet/perl lonnet.pm

[albertel]

albertel		Tue Sep  5 16:42:18 2006 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /loncom/interface	loncommon.pm 
  Log:
  - BUG#5002 <window> was mucking with submissions view of student view of problem
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.777 loncom/lonnet/perl/lonnet.pm:1.778
--- loncom/lonnet/perl/lonnet.pm:1.777	Thu Aug 31 08:30:23 2006
+++ loncom/lonnet/perl/lonnet.pm	Tue Sep  5 16:42:15 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.777 2006/08/31 12:30:23 albertel Exp $
+# $Id: lonnet.pm,v 1.778 2006/09/05 20:42:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1176,7 +1176,7 @@
     }
     my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                      &ssi($filelink,%form));
-    $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
+    $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
     $output=~s/^.*?\<body[^\>]*\>//si;
     $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
     return $output;
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.448 loncom/interface/loncommon.pm:1.449
--- loncom/interface/loncommon.pm:1.448	Wed Aug 30 15:36:49 2006
+++ loncom/interface/loncommon.pm	Tue Sep  5 16:42:18 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.448 2006/08/30 19:36:49 albertel Exp $
+# $Id: loncommon.pm,v 1.449 2006/09/05 20:42:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -729,9 +729,7 @@
     my $banner_link = "/adm/helpmenu?page=banner&amp;topic=$topic&amp;component_help=$component_help&amp;faq=$faq&amp;bug=$bug&amp;origurl=$origurl&amp;stamp=$timestamp&amp;stayonpage=$stayOnPage";
     my $output .= <<"ENDOUTPUT";
 <script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
 banner_link = '$banner_link';
-// END LON-CAPA Internal -->
 </script>
 ENDOUTPUT
     return $output;