X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FImport.php;h=b3ca0416359e41dfd9d5da1a75c9c7156a18f5f8;hb=0aa7ba71e0034b0a4a17722cdaa326d3fb76be01;hp=1448279940efa03c1497b549b5e84d1e2becb3d1;hpb=50cb6c038101d0b7c1f1b02a8f219ebdf2bbdd85;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Import.php b/includes/Import.php
index 1448279940..b3ca041635 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -429,53 +429,12 @@ class WikiImporter {
 		return '';
 	}
 
-	# --------------
-
-	/** Left in for debugging */
-	private function dumpElement() {
-		static $lookup = null;
-		if ( !$lookup ) {
-			$xmlReaderConstants = array(
-				"NONE",
-				"ELEMENT",
-				"ATTRIBUTE",
-				"TEXT",
-				"CDATA",
-				"ENTITY_REF",
-				"ENTITY",
-				"PI",
-				"COMMENT",
-				"DOC",
-				"DOC_TYPE",
-				"DOC_FRAGMENT",
-				"NOTATION",
-				"WHITESPACE",
-				"SIGNIFICANT_WHITESPACE",
-				"END_ELEMENT",
-				"END_ENTITY",
-				"XML_DECLARATION",
-			);
-			$lookup = array();
-
-			foreach ( $xmlReaderConstants as $name ) {
-				$lookup[constant( "XmlReader::$name" )] = $name;
-			}
-		}
-
-		print var_dump(
-			$lookup[$this->reader->nodeType],
-			$this->reader->name,
-			$this->reader->value
-		) . "\n\n";
-	}
-
 	/**
 	 * Primary entry point
 	 * @throws MWException
 	 * @return bool
 	 */
 	public function doImport() {
-
 		// Calls to reader->read need to be wrapped in calls to
 		// libxml_disable_entity_loader() to avoid local file
 		// inclusion attacks (bug 46932).
@@ -1050,30 +1009,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
@@ -1559,9 +1494,6 @@ class WikiRevision {
 		return true;
 	}
 
-	/**
-	 * @return mixed
-	 */
 	function importLogItem() {
 		$dbw = wfGetDB( DB_MASTER );
 		# @todo FIXME: This will not record autoblocks