From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 4 Sep 2008 06:19:27 +0000 (+0000)
Subject: Fix for bug 13770, second attempt. Tested with a conflicting install of both dom... 
X-Git-Tag: 1.31.0-rc.0~45494
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=371d2a0926ed4de89744651dfef98d236dea1fb8;p=lhc%2Fweb%2Fwiklou.git

Fix for bug 13770, second attempt. Tested with a conflicting install of both dom and domxml, as per the report.
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 6a85f29a4a..346be86bc2 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -134,6 +134,10 @@ class Parser
 		$this->mVarCache = array();
 		if ( isset( $conf['preprocessorClass'] ) ) {
 			$this->mPreprocessorClass = $conf['preprocessorClass'];
+		} elseif ( extension_loaded( 'domxml' ) ) {
+			// PECL extension that conflicts with the core DOM extension (bug 13770)
+			wfDebug( "Warning: you have the obsolete domxml extension for PHP. Please remove it!\n" );
+			$this->mPreprocessorClass = 'Preprocessor_Hash';
 		} elseif ( extension_loaded( 'dom' ) ) {
 			$this->mPreprocessorClass = 'Preprocessor_DOM';
 		} else {