Merge "Remove unused XMLReader2 class"

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index fa24dad..119f1a2 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -322,6 +322,7 @@ changes to languages because of Bugzilla reports.
 * HistoryPage - Use HistoryAction directly
 * RawPage - Use RawAction directly
 * StubContLang - Use Language::factory() instead
+* XMLReader2 - Use XMLReader directly
 
 == Compatibility ==
 

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index f35b380..ab5af1b 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -193,7 +193,6 @@ $wgAutoloadLocalClasses = array(
        'Xml' => 'includes/Xml.php',
        'XmlDumpWriter' => 'includes/Export.php',
        'XmlJsCode' => 'includes/Xml.php',
-       'XMLReader2' => 'includes/Import.php',
        'XmlSelect' => 'includes/Xml.php',
 
        # includes/actions

diff --git a/includes/Import.php b/includes/Import.php
index 1448279..e6b5dc2 100644 (file)
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1050,30 +1050,6 @@ class UploadSourceAdapter {
        }
 }
 
-class XMLReader2 extends XMLReader {
-
-       /**
-        * @return bool|string
-        */
-       function nodeContents() {
-               if ( $this->isEmptyElement ) {
-                       return "";
-               }
-               $buffer = "";
-               while ( $this->read() ) {
-                       switch ( $this->nodeType ) {
-                       case XmlReader::TEXT:
-                       case XmlReader::SIGNIFICANT_WHITESPACE:
-                               $buffer .= $this->value;
-                               break;
-                       case XmlReader::END_ELEMENT:
-                               return $buffer;
-                       }
-               }
-               return $this->close();
-       }
-}
-
 /**
  * @todo document (e.g. one-sentence class description).
  * @ingroup SpecialPage