[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_10_X) /xml lonxml.pm
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2010-09-29 16:12:17
Message-ID: cvsraeburn1285776737 () cvsserver
[Download RAW message or body]
raeburn Wed Sep 29 16:12:17 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/xml lonxml.pm
Log:
- Backport 1.518
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.505.2.3 loncom/xml/lonxml.pm:1.505.2.4
--- loncom/xml/lonxml.pm:1.505.2.3 Wed Sep 29 16:02:19 2010
+++ loncom/xml/lonxml.pm Wed Sep 29 16:12:17 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.505.2.3 2010/09/29 16:02:19 raeburn Exp $
+# $Id: lonxml.pm,v 1.505.2.4 2010/09/29 16:12:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1531,7 +1531,7 @@
my ($is_html,$is_xml);
if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) {
$is_xml = 1;
- } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\>\;)/is) {
+ } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) {
$is_html = 1;
}
unless ($is_xml || $is_html) {
_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic