From 4987ca768d40054fdaa54426607eff92f6853395 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Wed, 21 May 2008 16:26:53 +0000
Subject: [PATCH] Move rewRevisionFromEditComplete call down till after page
 rows set

---
 includes/Article.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index b25bca84e4..eaabb83a42 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1447,11 +1447,11 @@ class Article {
 
 				$dbw->begin();
 				$revisionId = $revision->insertOn( $dbw );
-				
-				wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, $baseRevId) );
 
 				# Update page
 				$ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
+				
+				wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, $baseRevId) );
 
 				if( !$ok ) {
 					/* Belated edit conflict! Run away!! */
@@ -1519,11 +1519,11 @@ class Article {
 			$revisionId = $revision->insertOn( $dbw );
 
 			$this->mTitle->resetArticleID( $newid );
-			
-			wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, false) );
 
 			# Update the page record with revision data
 			$this->updateRevisionOn( $dbw, $revision, 0 );
+			
+			wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, false) );
 
 			if( !( $flags & EDIT_SUPPRESS_RC ) ) {
 				$rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, $bot,
@@ -1871,8 +1871,6 @@ class Article {
 				# Insert a null revision
 				$nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true );
 				$nullRevId = $nullRevision->insertOn( $dbw );
-				
-				wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $nullRevision, false) );
 
 				# Update page record
 				$dbw->update( 'page',
@@ -1884,6 +1882,8 @@ class Article {
 						'page_id' => $id
 					), 'Article::protect'
 				);
+				
+				wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $nullRevision, false) );
 				wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
 
 				# Update the protection log
@@ -2975,9 +2975,10 @@ class Article {
 			'minor_edit' => $minor ? 1 : 0,
 			) );
 		$revision->insertOn( $dbw );
-		wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, false) );
 		$this->updateRevisionOn( $dbw, $revision );
 		$dbw->commit();
+		
+		wfRunHooks( 'newRevisionFromEditComplete', array($this->mTitle, $revision, false) );
 
 		wfProfileOut( __METHOD__ );
 	}
-- 
2.20.1