Update to MediaWiki 1.19.0

1 files changed, 325 insertions, 40 deletions

diff --git a/includes/Import.php b/includes/Import.php
index b874462e..e906c7f0 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -34,11 +34,13 @@ class WikiImporter {
 	private $reader = null;
 	private $mLogItemCallback, $mUploadCallback, $mRevisionCallback, $mPageCallback;
 	private $mSiteInfoCallback, $mTargetNamespace, $mPageOutCallback;
-	private $mDebug;
+	private $mNoticeCallback, $mDebug;
 	private $mImportUploads, $mImageBasePath;
+	private $mNoUpdates = false;
 
 	/**
 	 * Creates an ImportXMLReader drawing from the source provided
+	 * @param $source
 	 */
 	function __construct( $source ) {
 		$this->reader = new XMLReader();
@@ -47,8 +49,7 @@ class WikiImporter {
 		$id = UploadSourceAdapter::registerSource( $source );
 		if (defined( 'LIBXML_PARSEHUGE' ) ) {
 			$this->reader->open( "uploadsource://$id", null, LIBXML_PARSEHUGE );
-		}
-		else {
+		} else {
 			$this->reader->open( "uploadsource://$id" );
 		}
 
@@ -74,24 +75,44 @@ class WikiImporter {
 		wfDebug( "IMPORT: $data\n" );
 	}
 
-	private function notice( $data ) {
-		global $wgCommandLineMode;
-		if( $wgCommandLineMode ) {
-			print "$data\n";
-		} else {
-			global $wgOut;
-			$wgOut->addHTML( "<li>" . htmlspecialchars( $data ) . "</li>\n" );
+	private function notice( $msg /*, $param, ...*/ ) {
+		$params = func_get_args();
+		array_shift( $params );
+
+		if ( is_callable( $this->mNoticeCallback ) ) {
+			call_user_func( $this->mNoticeCallback, $msg, $params );
+		} else { # No ImportReporter -> CLI
+			echo wfMessage( $msg, $params )->text() . "\n";
 		}
 	}
 
 	/**
 	 * Set debug mode...
+	 * @param $debug bool
 	 */
 	function setDebug( $debug ) {
 		$this->mDebug = $debug;
 	}
 
 	/**
+	 * Set 'no updates' mode. In this mode, the link tables will not be updated by the importer
+	 * @param $noupdates bool
+	 */
+	function setNoUpdates( $noupdates ) {
+		$this->mNoUpdates = $noupdates;
+	}
+
+	/**
+	 * Set a callback that displays notice messages
+	 *
+	 * @param $callback callback
+	 * @return callback
+	 */
+	public function setNoticeCallback( $callback ) {
+		return wfSetVar( $this->mNoticeCallback, $callback );
+	}
+
+	/**
 	 * Sets the action to perform as each new page in the stream is reached.
 	 * @param $callback callback
 	 * @return callback
@@ -163,6 +184,8 @@ class WikiImporter {
 
 	/**
 	 * Set a target namespace to override the defaults
+	 * @param $namespace
+	 * @return bool
 	 */
 	public function setTargetNamespace( $namespace ) {
 		if( is_null( $namespace ) ) {
@@ -175,13 +198,17 @@ class WikiImporter {
 			return false;
 		}
 	}
-	
+
 	/**
-	 * 
+	 * @param $dir
 	 */
 	public function setImageBasePath( $dir ) {
 		$this->mImageBasePath = $dir;
 	}
+
+	/**
+	 * @param $import
+	 */
 	public function setImportUploads( $import ) {
 		$this->mImportUploads = $import;
 	}
@@ -189,6 +216,7 @@ class WikiImporter {
 	/**
 	 * Default per-revision callback, performs the import.
 	 * @param $revision WikiRevision
+	 * @return bool
 	 */
 	public function importRevision( $revision ) {
 		$dbw = wfGetDB( DB_MASTER );
@@ -198,6 +226,7 @@ class WikiImporter {
 	/**
 	 * Default per-revision callback, performs the import.
 	 * @param $rev WikiRevision
+	 * @return bool
 	 */
 	public function importLogItem( $rev ) {
 		$dbw = wfGetDB( DB_MASTER );
@@ -206,6 +235,8 @@ class WikiImporter {
 
 	/**
 	 * Dummy for now...
+	 * @param $revision
+	 * @return bool
 	 */
 	public function importUpload( $revision ) {
 		$dbw = wfGetDB( DB_MASTER );
@@ -214,6 +245,12 @@ class WikiImporter {
 
 	/**
 	 * Mostly for hook use
+	 * @param $title
+	 * @param $origTitle
+	 * @param $revCount
+	 * @param $sRevCount
+	 * @param $pageInfo
+	 * @return
 	 */
 	public function finishImportPage( $title, $origTitle, $revCount, $sRevCount, $pageInfo ) {
 		$args = func_get_args();
@@ -403,6 +440,10 @@ class WikiImporter {
 		return true;
 	}
 
+	/**
+	 * @return bool
+	 * @throws MWException
+	 */
 	private function handleSiteInfo() {
 		// Site info is useful, but not actually used for dump imports.
 		// Includes a quick short-circuit to save performance.
@@ -444,6 +485,10 @@ class WikiImporter {
 		$this->processLogItem( $logInfo );
 	}
 
+	/**
+	 * @param $logInfo
+	 * @return bool|mixed
+	 */
 	private function processLogItem( $logInfo ) {
 		$revision = new WikiRevision;
 
@@ -453,6 +498,7 @@ class WikiImporter {
 		$revision->setTimestamp( $logInfo['timestamp'] );
 		$revision->setParams( $logInfo['params'] );
 		$revision->setTitle( Title::newFromText( $logInfo['logtitle'] ) );
+		$revision->setNoUpdates( $this->mNoUpdates );
 
 		if ( isset( $logInfo['comment'] ) ) {
 			$revision->setComment( $logInfo['comment'] );
@@ -522,6 +568,9 @@ class WikiImporter {
 					$pageInfo );
 	}
 
+	/**
+	 * @param $pageInfo array
+	 */
 	private function handleRevision( &$pageInfo ) {
 		$this->debug( "Enter revision handler" );
 		$revisionInfo = array();
@@ -557,6 +606,11 @@ class WikiImporter {
 		}
 	}
 
+	/**
+	 * @param $pageInfo
+	 * @param $revisionInfo
+	 * @return bool|mixed
+	 */
 	private function processRevision( $pageInfo, $revisionInfo ) {
 		$revision = new WikiRevision;
 
@@ -587,10 +641,15 @@ class WikiImporter {
 		if ( isset( $revisionInfo['contributor']['username'] ) ) {
 			$revision->setUserName( $revisionInfo['contributor']['username'] );
 		}
+		$revision->setNoUpdates( $this->mNoUpdates );
 
 		return $this->revisionCallback( $revision );
 	}
 
+	/**
+	 * @param $pageInfo
+	 * @return mixed
+	 */
 	private function handleUpload( &$pageInfo ) {
 		$this->debug( "Enter upload handler" );
 		$uploadInfo = array();
@@ -627,7 +686,7 @@ class WikiImporter {
 				$skip = true;
 			}
 		}
-		
+
 		if ( $this->mImageBasePath && isset( $uploadInfo['rel'] ) ) {
 			$path = "{$this->mImageBasePath}/{$uploadInfo['rel']}";
 			if ( file_exists( $path ) ) {
@@ -640,14 +699,22 @@ class WikiImporter {
 			return $this->processUpload( $pageInfo, $uploadInfo );
 		}
 	}
-	
+
+	/**
+	 * @param $contents
+	 * @return string
+	 */
 	private function dumpTemp( $contents ) {
 		$filename = tempnam( wfTempDir(), 'importupload' );
 		file_put_contents( $filename, $contents );
 		return $filename;
 	}
 
-
+	/**
+	 * @param $pageInfo
+	 * @param $uploadInfo
+	 * @return mixed
+	 */
 	private function processUpload( $pageInfo, $uploadInfo ) {
 		$revision = new WikiRevision;
 		$text = isset( $uploadInfo['text'] ) ? $uploadInfo['text'] : '';
@@ -677,10 +744,14 @@ class WikiImporter {
 		if ( isset( $uploadInfo['contributor']['username'] ) ) {
 			$revision->setUserName( $uploadInfo['contributor']['username'] );
 		}
+		$revision->setNoUpdates( $this->mNoUpdates );
 
 		return call_user_func( $this->mUploadCallback, $revision );
 	}
 
+	/**
+	 * @return array
+	 */
 	private function handleContributor() {
 		$fields = array( 'id', 'ip', 'username' );
 		$info = array();
@@ -701,7 +772,13 @@ class WikiImporter {
 		return $info;
 	}
 
+	/**
+	 * @param $text string
+	 * @return Array or false
+	 */
 	private function processTitle( $text ) {
+		global $wgCommandLineMode;
+
 		$workTitle = $text;
 		$origTitle = Title::newFromText( $workTitle );
 
@@ -713,11 +790,22 @@ class WikiImporter {
 		}
 
 		if( is_null( $title ) ) {
-			// Invalid page title? Ignore the page
-			$this->notice( "Skipping invalid page title '$workTitle'" );
+			# Invalid page title? Ignore the page
+			$this->notice( 'import-error-invalid', $workTitle );
+			return false;
+		} elseif( $title->isExternal() ) {
+			$this->notice( 'import-error-interwiki', $title->getPrefixedText() );
+			return false;
+		} elseif( !$title->canExist() ) {
+			$this->notice( 'import-error-special', $title->getPrefixedText() );
+			return false;
+		} elseif( !$title->userCan( 'edit' ) && !$wgCommandLineMode ) {
+			# Do not import if the importing wiki user cannot edit this page
+			$this->notice( 'import-error-edit', $title->getPrefixedText() );
 			return false;
-		} elseif( $title->getInterwiki() != '' ) {
-			$this->notice( "Skipping interwiki page title '$workTitle'" );
+		} elseif( !$title->exists() && !$title->userCan( 'create' ) && !$wgCommandLineMode ) {
+			# Do not import if the importing wiki user cannot create this page
+			$this->notice( 'import-error-create', $title->getPrefixedText() );
 			return false;
 		}
 
@@ -733,6 +821,10 @@ class UploadSourceAdapter {
 	private $mBuffer;
 	private $mPosition;
 
+	/**
+	 * @param $source
+	 * @return string
+	 */
 	static function registerSource( $source ) {
 		$id = wfGenerateToken();
 
@@ -741,6 +833,13 @@ class UploadSourceAdapter {
 		return $id;
 	}
 
+	/**
+	 * @param $path
+	 * @param $mode
+	 * @param $options
+	 * @param $opened_path
+	 * @return bool
+	 */
 	function stream_open( $path, $mode, $options, &$opened_path ) {
 		$url = parse_url($path);
 		$id = $url['host'];
@@ -754,6 +853,10 @@ class UploadSourceAdapter {
 		return true;
 	}
 
+	/**
+	 * @param $count
+	 * @return string
+	 */
 	function stream_read( $count ) {
 		$return = '';
 		$leave = false;
@@ -779,18 +882,31 @@ class UploadSourceAdapter {
 		return $return;
 	}
 
+	/**
+	 * @param $data
+	 * @return bool
+	 */
 	function stream_write( $data ) {
 		return false;
 	}
 
+	/**
+	 * @return mixed
+	 */
 	function stream_tell() {
 		return $this->mPosition;
 	}
 
+	/**
+	 * @return bool
+	 */
 	function stream_eof() {
 		return $this->mSource->atEnd();
 	}
 
+	/**
+	 * @return array
+	 */
 	function url_stat() {
 		$result = array();
 
@@ -813,6 +929,10 @@ class UploadSourceAdapter {
 }
 
 class XMLReader2 extends XMLReader {
+
+	/**
+	 * @return bool|string
+	 */
 	function nodeContents() {
 		if( $this->isEmptyElement ) {
 			return "";
@@ -838,6 +958,10 @@ class XMLReader2 extends XMLReader {
  */
 class WikiRevision {
 	var $importer = null;
+
+	/**
+	 * @var Title
+	 */
 	var $title = null;
 	var $id = 0;
 	var $timestamp = "20010115000000";
@@ -853,7 +977,13 @@ class WikiRevision {
 	var $sha1base36 = false;
 	var $isTemp = false;
 	var $archiveName = '';
+	var $fileIsTemp;
+	private $mNoUpdates = false;
 
+	/**
+	 * @param $title
+	 * @throws MWException
+	 */
 	function setTitle( $title ) {
 		if( is_object( $title ) ) {
 			$this->title = $title;
@@ -864,139 +994,253 @@ class WikiRevision {
 		}
 	}
 
+	/**
+	 * @param $id
+	 */
 	function setID( $id ) {
 		$this->id = $id;
 	}
 
+	/**
+	 * @param $ts
+	 */
 	function setTimestamp( $ts ) {
 		# 2003-08-05T18:30:02Z
 		$this->timestamp = wfTimestamp( TS_MW, $ts );
 	}
 
+	/**
+	 * @param $user
+	 */
 	function setUsername( $user ) {
 		$this->user_text = $user;
 	}
 
+	/**
+	 * @param $ip
+	 */
 	function setUserIP( $ip ) {
 		$this->user_text = $ip;
 	}
 
+	/**
+	 * @param $text
+	 */
 	function setText( $text ) {
 		$this->text = $text;
 	}
 
+	/**
+	 * @param $text
+	 */
 	function setComment( $text ) {
 		$this->comment = $text;
 	}
 
+	/**
+	 * @param $minor
+	 */
 	function setMinor( $minor ) {
 		$this->minor = (bool)$minor;
 	}
 
+	/**
+	 * @param $src
+	 */
 	function setSrc( $src ) {
 		$this->src = $src;
 	}
+
+	/**
+	 * @param $src
+	 * @param $isTemp
+	 */
 	function setFileSrc( $src, $isTemp ) {
 		$this->fileSrc = $src;
 		$this->fileIsTemp = $isTemp;
 	}
-	function setSha1Base36( $sha1base36 ) { 
+
+	/**
+	 * @param $sha1base36
+	 */
+	function setSha1Base36( $sha1base36 ) {
 		$this->sha1base36 = $sha1base36;
 	}
 
+	/**
+	 * @param $filename
+	 */
 	function setFilename( $filename ) {
 		$this->filename = $filename;
 	}
+
+	/**
+	 * @param $archiveName
+	 */
 	function setArchiveName( $archiveName ) {
 		$this->archiveName = $archiveName;
 	}
 
+	/**
+	 * @param $size
+	 */
 	function setSize( $size ) {
 		$this->size = intval( $size );
 	}
 
+	/**
+	 * @param $type
+	 */
 	function setType( $type ) {
 		$this->type = $type;
 	}
 
+	/**
+	 * @param $action
+	 */
 	function setAction( $action ) {
 		$this->action = $action;
 	}
 
+	/**
+	 * @param $params
+	 */
 	function setParams( $params ) {
 		$this->params = $params;
 	}
 
 	/**
+	 * @param $noupdates
+	 */
+	public function setNoUpdates( $noupdates ) {
+		$this->mNoUpdates = $noupdates;
+	}
+
+	/**
 	 * @return Title
 	 */
 	function getTitle() {
 		return $this->title;
 	}
 
+	/**
+	 * @return int
+	 */
 	function getID() {
 		return $this->id;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getTimestamp() {
 		return $this->timestamp;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getUser() {
 		return $this->user_text;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getText() {
 		return $this->text;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getComment() {
 		return $this->comment;
 	}
 
+	/**
+	 * @return bool
+	 */
 	function getMinor() {
 		return $this->minor;
 	}
 
+	/**
+	 * @return mixed
+	 */
 	function getSrc() {
 		return $this->src;
 	}
+
+	/**
+	 * @return bool|String
+	 */
 	function getSha1() {
 		if ( $this->sha1base36 ) {
 			return wfBaseConvert( $this->sha1base36, 36, 16 );
 		}
 		return false;
 	}
+
+	/**
+	 * @return string
+	 */
 	function getFileSrc() {
 		return $this->fileSrc;
 	}
+
+	/**
+	 * @return bool
+	 */
 	function isTempSrc() {
 		return $this->isTemp;
 	}
 
+	/**
+	 * @return mixed
+	 */
 	function getFilename() {
 		return $this->filename;
 	}
+
+	/**
+	 * @return string
+	 */
 	function getArchiveName() {
 		return $this->archiveName;
 	}
 
+	/**
+	 * @return mixed
+	 */
 	function getSize() {
 		return $this->size;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getType() {
 		return $this->type;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getAction() {
 		return $this->action;
 	}
 
+	/**
+	 * @return string
+	 */
 	function getParams() {
 		return $this->params;
 	}
 
+	/**
+	 * @return bool
+	 */
 	function importOldRevision() {
 		$dbw = wfGetDB( DB_MASTER );
 
@@ -1016,14 +1260,14 @@ class WikiRevision {
 		$linkCache = LinkCache::singleton();
 		$linkCache->clear();
 
-		$article = new Article( $this->title );
-		$pageId = $article->getId();
-		if( $pageId == 0 ) {
+		$page = WikiPage::factory( $this->title );
+		if( !$page->exists() ) {
 			# must create the page...
-			$pageId = $article->insertOn( $dbw );
+			$pageId = $page->insertOn( $dbw );
 			$created = true;
 			$oldcountable = null;
 		} else {
+			$pageId = $page->getId();
 			$created = false;
 
 			$prior = $dbw->selectField( 'revision', '1',
@@ -1039,7 +1283,7 @@ class WikiRevision {
 					$this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" );
 				return false;
 			}
-			$oldcountable = $article->isCountable();
+			$oldcountable = $page->isCountable();
 		}
 
 		# @todo FIXME: Use original rev_id optionally (better for backups)
@@ -1054,16 +1298,19 @@ class WikiRevision {
 			'minor_edit' => $this->minor,
 			) );
 		$revision->insertOn( $dbw );
-		$changed = $article->updateIfNewerOn( $dbw, $revision );
+		$changed = $page->updateIfNewerOn( $dbw, $revision );
 
-		if ( $changed !== false ) {
+		if ( $changed !== false && !$this->mNoUpdates ) {
 			wfDebug( __METHOD__ . ": running updates\n" );
-			$article->doEditUpdates( $revision, $userObj, array( 'created' => $created, 'oldcountable' => $oldcountable ) );
+			$page->doEditUpdates( $revision, $userObj, array( 'created' => $created, 'oldcountable' => $oldcountable ) );
 		}
 
 		return true;
 	}
 
+	/**
+	 * @return mixed
+	 */
 	function importLogItem() {
 		$dbw = wfGetDB( DB_MASTER );
 		# @todo FIXME: This will not record autoblocks
@@ -1089,7 +1336,7 @@ class WikiRevision {
 		if( $prior ) {
 			wfDebug( __METHOD__ . ": skipping existing item for Log:{$this->type}/{$this->action}, timestamp " .
 				$this->timestamp . "\n" );
-			return false;
+			return;
 		}
 		$log_id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
 		$data = array(
@@ -1107,19 +1354,22 @@ class WikiRevision {
 		$dbw->insert( 'logging', $data, __METHOD__ );
 	}
 
+	/**
+	 * @return bool
+	 */
 	function importUpload() {
 		# Construct a file
 		$archiveName = $this->getArchiveName();
 		if ( $archiveName ) {
 			wfDebug( __METHOD__ . "Importing archived file as $archiveName\n" );
-			$file = OldLocalFile::newFromArchiveName( $this->getTitle(), 
-				RepoGroup::singleton()->getLocalRepo(), $archiveName );			
+			$file = OldLocalFile::newFromArchiveName( $this->getTitle(),
+				RepoGroup::singleton()->getLocalRepo(), $archiveName );
 		} else {
 			$file = wfLocalFile( $this->getTitle() );
 			wfDebug( __METHOD__ . 'Importing new file as ' . $file->getName() . "\n" );
 			if ( $file->exists() && $file->getTimestamp() > $this->getTimestamp() ) {
 				$archiveName = $file->getTimestamp() . '!' . $file->getName();
-				$file = OldLocalFile::newFromArchiveName( $this->getTitle(), 
+				$file = OldLocalFile::newFromArchiveName( $this->getTitle(),
 					RepoGroup::singleton()->getLocalRepo(), $archiveName );
 				wfDebug( __METHOD__ . "File already exists; importing as $archiveName\n" );
 			}
@@ -1128,7 +1378,7 @@ class WikiRevision {
 			wfDebug( __METHOD__ . ': Bad file for ' . $this->getTitle() . "\n" );
 			return false;
 		}
-		
+
 		# Get the file source or download if necessary
 		$source = $this->getFileSrc();
 		$flags = $this->isTempSrc() ? File::DELETE_SOURCE : 0;
@@ -1151,16 +1401,16 @@ class WikiRevision {
 		}
 
 		$user = User::newFromName( $this->user_text );
-		
+
 		# Do the actual upload
 		if ( $archiveName ) {
-			$status = $file->uploadOld( $source, $archiveName, 
+			$status = $file->uploadOld( $source, $archiveName,
 				$this->getTimestamp(), $this->getComment(), $user, $flags );
 		} else {
-			$status = $file->upload( $source, $this->getComment(), $this->getComment(), 
+			$status = $file->upload( $source, $this->getComment(), $this->getComment(),
 				$flags, false, $this->getTimestamp(), $user );
 		}
-		
+
 		if ( $status->isGood() ) {
 			wfDebug( __METHOD__ . ": Succesful\n" );
 			return true;
@@ -1170,6 +1420,9 @@ class WikiRevision {
 		}
 	}
 
+	/**
+	 * @return bool|string
+	 */
 	function downloadSource() {
 		global $wgEnableUploads;
 		if( !$wgEnableUploads ) {
@@ -1211,17 +1464,22 @@ class ImportStringSource {
 		$this->mRead = false;
 	}
 
+	/**
+	 * @return bool
+	 */
 	function atEnd() {
 		return $this->mRead;
 	}
 
+	/**
+	 * @return bool|string
+	 */
 	function readChunk() {
 		if( $this->atEnd() ) {
 			return false;
-		} else {
-			$this->mRead = true;
-			return $this->mString;
 		}
+		$this->mRead = true;
+		return $this->mString;
 	}
 }
 
@@ -1234,14 +1492,24 @@ class ImportStreamSource {
 		$this->mHandle = $handle;
 	}
 
+	/**
+	 * @return bool
+	 */
 	function atEnd() {
 		return feof( $this->mHandle );
 	}
 
+	/**
+	 * @return string
+	 */
 	function readChunk() {
 		return fread( $this->mHandle, 32768 );
 	}
 
+	/**
+	 * @param $filename string
+	 * @return Status
+	 */
 	static function newFromFile( $filename ) {
 		wfSuppressWarnings();
 		$file = fopen( $filename, 'rt' );
@@ -1252,6 +1520,10 @@ class ImportStreamSource {
 		return Status::newGood( new ImportStreamSource( $file ) );
 	}
 
+	/**
+	 * @param $fieldname string
+	 * @return Status
+	 */
 	static function newFromUpload( $fieldname = "xmlimport" ) {
 		$upload =& $_FILES[$fieldname];
 
@@ -1280,6 +1552,11 @@ class ImportStreamSource {
 		}
 	}
 
+	/**
+	 * @param $url
+	 * @param $method string
+	 * @return Status
+	 */
 	static function newFromURL( $url, $method = 'GET' ) {
 		wfDebug( __METHOD__ . ": opening $url\n" );
 		# Use the standard HTTP fetch function; it times out
@@ -1298,6 +1575,14 @@ class ImportStreamSource {
 		}
 	}
 
+	/**
+	 * @param $interwiki
+	 * @param $page
+	 * @param $history bool
+	 * @param $templates bool
+	 * @param $pageLinkDepth int
+	 * @return Status
+	 */
 	public static function newFromInterwiki( $interwiki, $page, $history = false, $templates = false, $pageLinkDepth = 0 ) {
 		if( $page == '' ) {
 			return Status::newFatal( 'import-noarticle' );