From 56215498516e19d4d6737948ce0ed8934903915c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 27 Nov 2008 18:32:29 +0000
Subject: [PATCH] Add $user to NewRevisionFromEditComplete hook

---
 docs/hooks.txt                      | 1 +
 includes/Article.php                | 8 ++++----
 includes/Title.php                  | 8 ++++----
 includes/filerepo/LocalFile.php     | 2 +-
 includes/specials/SpecialImport.php | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 4fe332c011..ac9fd427ea 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -931,6 +931,7 @@ $tools: array of tools
 $article: the article edited
 $rev: the new revision
 $baseID: the revision ID this was based off, if any
+$user: the editing user
 
 'NormalizeMessageKey': Called before the software gets the text of a message
   (stuff in the MediaWiki: namespace), useful for changing WHAT message gets displayed
diff --git a/includes/Article.php b/includes/Article.php
index f64e9f413c..b9dcc5b51a 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1556,7 +1556,7 @@ class Article {
 					$revisionId = 0;
 					$dbw->rollback();
 				} else {
-					wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId ) );
+					wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId, $user) );
 
 					# Update recentchanges
 					if( !( $flags & EDIT_SUPPRESS_RC ) ) {
@@ -1635,7 +1635,7 @@ class Article {
 			# Update the page record with revision data
 			$this->updateRevisionOn( $dbw, $revision, 0 );
 
-			wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $user) );
 
 			if( !( $flags & EDIT_SUPPRESS_RC ) ) {
 				$rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
@@ -1979,7 +1979,7 @@ class Article {
 					), 'Article::protect'
 				);
 
-				wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest) );
+				wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest, $wgUser) );
 				wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
 
 				# Update the protection log
@@ -3104,7 +3104,7 @@ class Article {
 		$revision->insertOn( $dbw );
 		$this->updateRevisionOn( $dbw, $revision );
 
-		wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $wgUser) );
 
 		wfProfileOut( __METHOD__ );
 	}
diff --git a/includes/Title.php b/includes/Title.php
index 9be7ace8e6..aa9a739bdf 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2671,7 +2671,7 @@ class Title {
 		$nullRevId = $nullRevision->insertOn( $dbw );
 		
 		$article = new Article( $this );
-		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
 		# Change the name of the target page:
 		$dbw->update( 'page',
@@ -2699,7 +2699,7 @@ class Title {
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
 			# Now, we record the link from the redirect to the new title.
 			# It should have no other outgoing links...
@@ -2768,7 +2768,7 @@ class Title {
 		$nullRevId = $nullRevision->insertOn( $dbw );
 		
 		$article = new Article( $this );
-		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
 		# Rename page entry
 		$dbw->update( 'page',
@@ -2796,7 +2796,7 @@ class Title {
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
 			# Record the just-created redirect's linking to the page
 			$dbw->insert( 'pagelinks',
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 25a9e39435..b0bdb429db 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -896,7 +896,7 @@ class LocalFile extends File
 			$nullRevision = Revision::newNullRevision( $dbw, $descTitle->getArticleId(), $log->getRcComment(), false );
 			$nullRevision->insertOn( $dbw );
 			
-			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $user) );
 			$article->updateRevisionOn( $dbw, $nullRevision );
 
 			# Invalidate the cache for the description page
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index b811d2943d..1af028d360 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -256,7 +256,7 @@ class ImportReporter {
 			$article = new Article( $title );
 			# Update page record
 			$article->updateRevisionOn( $dbw, $nullRevision );
-			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
+			wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 		} else {
 			$wgOut->addHTML( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
 		}
-- 
2.20.1