* (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 cd05e1e..61f0a81 100644 (file)
--- 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 1aee8cd..6de2da1 100644 (file)
--- 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 ) {