Move the hook 'NewRevisionFromEditComplete'

It should not run if a belated edit conflict occurs.
Issue reported by the German community after some weired revision histories were found.

diff --git a/includes/Article.php b/includes/Article.php
index 0c24e70..4d8277b 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1458,14 +1458,14 @@ class Article {
 
                                # Update page
                                $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
-                               
-                               wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId) );
 
                                if( !$ok ) {
                                        /* Belated edit conflict! Run away!! */
                                        $good = false;
                                        $dbw->rollback();
                                } else {
+                                       wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId ) );
+
                                        # Update recentchanges
                                        if( !( $flags & EDIT_SUPPRESS_RC ) ) {
                                                $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,