incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1226909 - /incubator/ooo/ooo-site/trunk/lib/view.pm
Date Tue, 03 Jan 2012 18:44:47 GMT
Author: joes
Date: Tue Jan  3 18:44:47 2012
New Revision: 1226909

URL: http://svn.apache.org/viewvc?rev=1226909&view=rev
Log:
some of these pages are malformed with no <body/> tag- try to dtrt here.

Modified:
    incubator/ooo/ooo-site/trunk/lib/view.pm

Modified: incubator/ooo/ooo-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/view.pm?rev=1226909&r1=1226908&r2=1226909&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/view.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/view.pm Tue Jan  3 18:44:47 2012
@@ -117,7 +117,7 @@ sub html_page {
 	}
     }
 
-    if ($args{content} =~ m!<head>(.*?)</head>.*?<body.*?>(.*?)</body>!si)
{
+    if ($args{content} =~ m!<head>(.*?)</head>(?:.*?:<body.*?>)?(.*?)(?:</body>|\Z)!si)
{
         @args{qw/header content/} = ($1, $2);
     }
 



Mime
View raw message