From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 26 Apr 2007 18:16:41 +0000 (+0000)
Subject: * (bug 9682) Revert PHP 5.1 dependency on warning suppression for SVN info
X-Git-Tag: 1.31.0-rc.0~53218
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=f858d0e61b5559883995669f68bb07db1c4d55cc;p=lhc%2Fweb%2Fwiklou.git

* (bug 9682) Revert PHP 5.1 dependency on warning suppression for SVN info
Partial revert of r19003; use of new parameter causes extra whinging on PHP 5.0 apparently
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cd05e1edb2..61f0a81880 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -354,6 +354,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 9582) Members of bot group now mark edits patrolled by default
 * (bug 9669) Fix limit ordering for rebuildrecentchanges; broken since
   converted from 1.4 to 1.5 schema
+* (bug 9682) Revert PHP 5.1 dependency on warning suppression for SVN info
 
 
 == Maintenance ==
diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index 1aee8cdce7..6de2da1190 100644
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -282,7 +282,10 @@ class SpecialVersion {
 				return false;
 			}
 
-			$xml = simplexml_load_file( $entries, "SimpleXMLElement", LIBXML_NOWARNING );
+			// SimpleXml whines about the xmlns...
+			wfSuppressWarnings();
+			$xml = simplexml_load_file( $entries );
+			wfRestoreWarnings();
 
 			if( $xml ) {
 				foreach( $xml->entry as $entry ) {