From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 27 Jun 2006 22:45:40 +0000 (+0000)
Subject: * Save null edit when importing pages through Special:Import
X-Git-Tag: 1.31.0-rc.0~56565
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=5baebec3d349cb8adcb6fd9c84d1b54fa2431024;p=lhc%2Fweb%2Fwiklou.git

* Save null edit when importing pages through Special:Import
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9379699a8d..fc15553206 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -584,6 +584,7 @@ Some default configuration options have changed:
   pages with more than $wgExportMaxHistory revisions are excluded from
   export when history is requested.
 * Fix transwiki import of pages with space in name
+* Save null edit when importing pages through Special:Import
 
 
 == Compatibility ==
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 65ae089763..8a121ee013 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -151,7 +151,7 @@ function wfSpecialImport( $page = '' ) {
  */
 class ImportReporter {
 	function __construct( $importer, $upload, $interwiki ) {
-		$importer->setPageCallback( array( $this, 'reportPage' ) );
+		$importer->setPageOutCallback( array( $this, 'reportPage' ) );
 		$this->mPageCount = 0;
 		$this->mIsUpload = $upload;
 		$this->mInterwiki = $interwiki;
@@ -162,23 +162,40 @@ class ImportReporter {
 		$wgOut->addHtml( "<ul>\n" );
 	}
 	
-	function reportPage( $pageName ) {
-		global $wgOut, $wgUser;
+	function reportPage( $pageName, $revisionCount ) {
+		global $wgOut, $wgUser, $wgLang, $wgContLang;
+		
 		$skin = $wgUser->getSkin();
 		$title = Title::newFromText( $pageName );
+		
 		$this->mPageCount++;
 		
-		$wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . "</li>\n" );
+		$localCount = $wgLang->formatNum( $revisionCount );
+		$contentCount = $wgContLang->formatNum( $revisionCount );
+		
+		$wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) .
+			" " .
+			wfMsgHtml( 'import-revision-count', $localCount ) .
+			"</li>\n" );
 		
 		$log = new LogPage( 'import' );
 		if( $this->mIsUpload ) {
-			$log->addEntry( 'upload', $title, '' );
+			$detail = wfMsgForContent( 'import-logentry-upload-detail',
+				$contentCount );
+			$log->addEntry( 'upload', $title, $detail );
 		} else {
 			$interwiki = '[[:' . $this->mInterwiki . ':' .
 				$title->getPrefixedText() . ']]';
-			$log->addEntry( 'interwiki', $title,
-				wfMsg( 'import-logentry-interwiki-source', $interwiki ) );
+			$detail = wfMsgForContent( 'import-logentry-interwiki-detail',
+				$contentCount, $interwiki );
+			$log->addEntry( 'interwiki', $title, $detail );
 		}
+		
+		$comment = $detail; // quick
+		$dbw = wfGetDB( DB_MASTER );
+		$nullRevision = Revision::newNullRevision(
+			$dbw, $title->getArticleId(), $comment, true );
+		$nullRevId = $nullRevision->insertOn( $dbw );
 	}
 	
 	function close() {
@@ -347,6 +364,7 @@ class WikiRevision {
 class WikiImporter {
 	var $mSource = null;
 	var $mPageCallback = null;
+	var $mPageOutCallback = null;
 	var $mRevisionCallback = null;
 	var $lastfield;
 
@@ -414,6 +432,18 @@ class WikiImporter {
 		return $previous;
 	}
 
+	/**
+	 * Sets the action to perform as each page in the stream is completed.
+	 * Callback accepts the page title and a count of revisions.
+	 * @param callable $callback
+	 * @return callable
+	 */
+	function setPageOutCallback( $callback ) {
+		$previous = $this->mPageOutCallback;
+		$this->mPageOutCallback = $callback;
+		return $previous;
+	}
+
 	/**
 	 * Sets the action to perform as each page revision is reached.
 	 * @param callable $callback
@@ -464,6 +494,18 @@ class WikiImporter {
 		}
 	}
 
+	/**
+	 * Notify the callback function when a </page> is closed.
+	 * @param Title $title
+	 * @param int $revisionCount
+	 * @private
+	 */
+	function pageOutCallback( $title, $revisionCount ) {
+		if( is_callable( $this->mPageOutCallback ) ) {
+			call_user_func( $this->mPageOutCallback, $title, $revisionCount );
+		}
+	}
+
 
 	# XML parser callbacks from here out -- beware!
 	function donothing( $parser, $x, $y="" ) {
@@ -483,6 +525,7 @@ class WikiImporter {
 		if( $name == 'siteinfo' ) {
 			xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
 		} elseif( $name == 'page' ) {
+			$this->workRevisionCount = 0;
 			xml_set_element_handler( $parser, "in_page", "out_page" );
 		} else {
 			return $this->throwXMLerror( "Expected <page>, got <$name>" );
@@ -535,6 +578,7 @@ class WikiImporter {
 		case "revision":
 			$this->workRevision = new WikiRevision;
 			$this->workRevision->setTitle( $this->workTitle );
+			$this->workRevisionCount++;
 			xml_set_element_handler( $parser, "in_revision", "out_revision" );
 			break;
 		default:
@@ -549,8 +593,11 @@ class WikiImporter {
 		}
 		xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
 
+		$this->pageOutCallback( $this->workTitle, $this->workRevisionCount );
+		
 		$this->workTitle = NULL;
 		$this->workRevision = NULL;
+		$this->workRevisionCount = 0;
 	}
 
 	function in_nothing( $parser, $name, $attribs ) {
diff --git a/languages/Messages.php b/languages/Messages.php
index ce93b4b1ea..f7dc51962e 100644
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1464,6 +1464,7 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'import-interwiki-submit' => 'Import',
 'importtext'	=> 'Please export the file from the source wiki using the Special:Export utility, save it to your disk and upload it here.',
 'importstart'	=> "Importing pages...",
+'import-revision-count' => '$1 revision(s)',
 'importnopages'	=> "No pages to import.",
 'importfailed'	=> "Import failed: $1",
 'importnotext'	=> 'Empty or no text',
@@ -1477,8 +1478,9 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 'importlogpage' => 'Import log',
 'importlogpagetext' => 'Administrative imports of pages with edit history from other wikis.',
 'import-logentry-upload' => 'imported $1 by file upload',
+'import-logentry-upload-detail' => '$1 revision(s)',
 'import-logentry-interwiki' => 'transwikied $1',
-'import-logentry-interwiki-source' => 'from $1',
+'import-logentry-interwiki-detail' => '$1 revision(s) from $2',
 
 
 # Keyboard access keys for power users