http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96656
Revision: 96656
Author: catrope
Date: 2011-09-09 11:32:02 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
1.17wmf1: MFT r96655, which was a commit of a live hack to begin with
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php
Modified: branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php
===================================================================
--- branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php 2011-09-09
11:28:00 UTC (rev 96655)
+++ branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php 2011-09-09
11:32:02 UTC (rev 96656)
@@ -134,7 +134,8 @@
if ( !$result ) {
// Try running the XML through UtfNormal to get rid of
invalid characters
$xml = UtfNormal::cleanUp( $xml );
- $result = $dom->loadXML( $xml );
+ // 1 << 19 == XML_PARSE_HUGE, needed so newer versions
of libxml2 don't barf when the XML is >256 levels deep
+ $result = $dom->loadXML( $xml, 1 << 19 );
if ( !$result ) {
throw new MWException( __METHOD__.' generated
invalid XML' );
}
Property changes on: branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/parser/Preprocessor_DOM.php:51646
/branches/new-installer/phase3/includes/parser/Preprocessor_DOM.php:43664-66004
/branches/sqlite/includes/parser/Preprocessor_DOM.php:58211-58321
/branches/wmf/1.16wmf4/includes/parser/Preprocessor_DOM.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/parser/Preprocessor_DOM.php:53381,60970
/trunk/phase3/includes/parser/Preprocessor_DOM.php:83590,89512-89513,96655
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
