Fixes for r88113 and some realted changes:

* Modified <s>Article::editUpdates()</s> WikiPage::doEditUpdates() arguments to take a Revision object, an User object and options (much more readable that those boolean parameters)
* Call isCountable() on the old content and pass it to WikiPage::doEditUpdates() with the 'oldcountable' option so that it really reflects the old state of the page
* Updated all calls (no one in extensions) and removed the wrapper WikiPage::editUpdates()
* Call onArticleEdit() and onArticleCreate() (the one that is of course) from doEditUpdates()
* Removed $wgTitle hack from Import.php

diff --git a/includes/Import.php b/includes/Import.php
index 8f12d72..2a86438 100644 (file)
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1000,9 +1000,11 @@ class WikiRevision {
                if( $user ) {
                        $userId = intval( $user->getId() );
                        $userText = $user->getName();
+                       $userObj = $user;
                } else {
                        $userId = 0;
                        $userText = $this->getUser();
+                       $userObj = new User;
                }
 
                // avoid memory leak...?
@@ -1015,6 +1017,7 @@ class WikiRevision {
                        # must create the page...
                        $pageId = $article->insertOn( $dbw );
                        $created = true;
+                       $oldcountable = null;
                } else {
                        $created = false;
 
@@ -1031,6 +1034,7 @@ class WikiRevision {
                                        $this->title->getPrefixedText() . "]], timestamp " . $this->timestamp . "\n" );
                                return false;
                        }
+                       $oldcountable = $article->isCountable();
                }
 
                # @todo FIXME: Use original rev_id optionally (better for backups)
@@ -1044,33 +1048,13 @@ class WikiRevision {
                        'timestamp'  => $this->timestamp,
                        'minor_edit' => $this->minor,
                        ) );
-               $revId = $revision->insertOn( $dbw );
+               $revision->insertOn( $dbw );
                $changed = $article->updateIfNewerOn( $dbw, $revision );
 
-               # To be on the safe side...
-               $tempTitle = $GLOBALS['wgTitle'];
-               $GLOBALS['wgTitle'] = $this->title;
-
-               if ( $created ) {
-                       wfDebug( __METHOD__ . ": running onArticleCreate\n" );
-                       Article::onArticleCreate( $this->title );
-               } elseif( $changed ) {
-                       wfDebug( __METHOD__ . ": running onArticleEdit\n" );
-                       Article::onArticleEdit( $this->title );
-               }
-
-               wfDebug( __METHOD__ . ": running updates\n" );
-               $article->editUpdates(
-                       $this->getText(),
-                       $this->getComment(),
-                       $this->minor,
-                       $this->timestamp,
-                       $revId,
-                       true,
-                       null,
-                       $created );
-
-               $GLOBALS['wgTitle'] = $tempTitle;
+               if ( $changed !== false ) {
+                       wfDebug( __METHOD__ . ": running updates\n" );
+                       $article->doEditUpdates( $revision, $userObj, array( 'created' => $created, 'oldcountable' => $oldcountable ) );
+               }
 
                return true;
        }

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 6ae64ad..fa36ae7 100644 (file)
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1004,6 +1004,7 @@ class WikiPage extends Page {
 
                $oldtext = $this->getRawText(); // current revision
                $oldsize = strlen( $oldtext );
+               $oldcountable = $this->isCountable();
 
                # Provide autosummaries if one is not provided and autosummaries are enabled.
                if ( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) {
@@ -1027,6 +1028,17 @@ class WikiPage extends Page {
                                $userAbort = ignore_user_abort( true );
                        }
 
+                       $revision = new Revision( array(
+                               'page'       => $this->getId(),
+                               'comment'    => $summary,
+                               'minor_edit' => $isminor,
+                               'text'       => $text,
+                               'parent_id'  => $this->mLatest,
+                               'user'       => $user->getId(),
+                               'user_text'  => $user->getName(),
+                               'timestamp'  => $now
+                       ) );
+
                        $changed = ( strcmp( $text, $oldtext ) != 0 );
 
                        if ( $changed ) {
@@ -1039,17 +1051,6 @@ class WikiPage extends Page {
                                        return $status;
                                }
 
-                               $revision = new Revision( array(
-                                       'page'       => $this->getId(),
-                                       'comment'    => $summary,
-                                       'minor_edit' => $isminor,
-                                       'text'       => $text,
-                                       'parent_id'  => $this->mLatest,
-                                       'user'       => $user->getId(),
-                                       'user_text'  => $user->getName(),
-                                       'timestamp'  => $now
-                               ) );
-
                                $dbw->begin();
                                $revisionId = $revision->insertOn( $dbw );
 
@@ -1095,14 +1096,6 @@ class WikiPage extends Page {
                                        $user->incEditCount();
                                        $dbw->commit();
                                }
-                       } else {
-                               $status->warning( 'edit-no-change' );
-                               $revision = null;
-                               // Keep the same revision ID, but do some updates on it
-                               $revisionId = $this->getLatest();
-                               // Update page_touched, this is usually implicit in the page update
-                               // Other cache updates are done in onArticleEdit()
-                               $this->mTitle->invalidateCache();
                        }
 
                        if ( !$wgDBtransactions ) {
@@ -1115,11 +1108,19 @@ class WikiPage extends Page {
                                return $status;
                        }
 
-                       # Invalidate cache of this article and all pages using this article
-                       # as a template. Partly deferred.
-                       self::onArticleEdit( $this->mTitle );
                        # Update links tables, site stats, etc.
-                       $this->doEditUpdates( $text, $user, $summary, $isminor, $revisionId, $changed );
+                       $this->doEditUpdates( $revision, $user, array( 'changed' => $changed,
+                               'oldcountable' => $oldcountable ) );
+
+                       if ( !$changed ) {
+                               $status->warning( 'edit-no-change' );
+                               $revision = null;
+                               // Keep the same revision ID, but do some updates on it
+                               $revisionId = $this->getLatest();
+                               // Update page_touched, this is usually implicit in the page update
+                               // Other cache updates are done in onArticleEdit()
+                               $this->mTitle->invalidateCache();
+                       }
                } else {
                        # Create new article
                        $status->value['new'] = true;
@@ -1180,10 +1181,7 @@ class WikiPage extends Page {
                        $dbw->commit();
 
                        # Update links, etc.
-                       $this->doEditUpdates( $text, $user, $summary, $isminor, $revisionId, true, true );
-
-                       # Clear caches
-                       self::onArticleCreate( $this->mTitle );
+                       $this->doEditUpdates( $revision, $user, array( 'created' => true ) );
 
                        wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary,
                                $flags & EDIT_MINOR, null, null, &$flags, $revision ) );
@@ -1900,26 +1898,29 @@ class WikiPage extends Page {
         * Every 100th edit, prune the recent changes table.
         *
         * @private
-        * @param $text String: New text of the article
-        * @param $user User object: User doing the edit
-        * @param $summary String: Edit summary
-        * @param $minoredit Boolean: Minor edit
-        * @param $newid Integer: rev_id value of the new revision
-        * @param $changed Boolean: Whether or not the content actually changed
-        * @param $created Boolean: Whether the edit created the page
-        */
-       public function doEditUpdates(
-               $text, $user, $summary, $minoredit, $newid, $changed = true, $created = false
-       ) {
+        * @param $revision Revision object
+        * @param $user User object that did the revision
+        * @param $options Array of options, following indexes are used:
+        * - changed: boolean, whether the revision changed the content (default true)
+        * - created: boolean, whether the revision created the page (default false)
+        * - oldcountable: boolean or null (default null):
+        *   - boolean: whether the page was counted as an article before that
+        *     revision, only used in changed is true and created is false
+        *   - null: don't change the article count
+        */
+       public function doEditUpdates( Revision $revision, User $user, array $options = array() ) {
                global $wgDeferredUpdateList, $wgEnableParserCache;
 
                wfProfileIn( __METHOD__ );
 
+               $options += array( 'changed' => true, 'created' => false, 'oldcountable' => null );
+               $text = $revision->getText();
+
                # Parse the text
                # Be careful not to double-PST: $text is usually already PST-ed once
                if ( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
                        wfDebug( __METHOD__ . ": No prepared edit or vary-revision is set...\n" );
-                       $editInfo = $this->prepareTextForEdit( $text, $newid, $user );
+                       $editInfo = $this->prepareTextForEdit( $text, $revision->getId(), $user );
                } else {
                        wfDebug( __METHOD__ . ": No vary-revision, using prepared edit...\n" );
                        $editInfo = $this->mPreparedEdit;
@@ -1935,7 +1936,7 @@ class WikiPage extends Page {
                $u = new LinksUpdate( $this->mTitle, $editInfo->output );
                $u->doUpdate();
 
-               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) );
+               wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $options['changed'] ) );
 
                if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
                        if ( 0 == mt_rand( 0, 99 ) ) {
@@ -1962,14 +1963,17 @@ class WikiPage extends Page {
                        return;
                }
 
-               if ( !$changed ) {
+               if ( !$options['changed'] ) {
                        $good = 0;
                        $total = 0;
-               } elseif ( $created ) {
+               } elseif ( $options['created'] ) {
                        $good = (int)$this->isCountable( $editInfo );
                        $total = 1;
+               } elseif ( $options['oldcountable'] !== null ) {
+                       $good = (int)$this->isCountable( $editInfo ) - (int)$options['oldcountable'];
+                       $total = 0;
                } else {
-                       $good = (int)$this->isCountable( $editInfo ) - (int)$this->isCountable();
+                       $good = 0;
                        $total = 0;
                }
 
@@ -1981,7 +1985,7 @@ class WikiPage extends Page {
                # load of user talk pages and piss people off, nor if it's a minor edit
                # by a properly-flagged bot.
                if ( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $user->getTitleKey() && $changed
-                       && !( $minoredit && $user->isAllowed( 'nominornewtalk' ) )
+                       && !( $revision->isMinor() && $user->isAllowed( 'nominornewtalk' ) )
                ) {
                        if ( wfRunHooks( 'ArticleEditUpdateNewTalk', array( &$this ) ) ) {
                                $other = User::newFromName( $shortTitle, false );
@@ -2002,6 +2006,12 @@ class WikiPage extends Page {
                        MessageCache::singleton()->replace( $shortTitle, $text );
                }
 
+               if( $options['created'] ) {
+                       self::onArticleCreate( $this->mTitle );
+               } else {
+                       self::onArticleEdit( $this->mTitle );
+               }
+
                wfProfileOut( __METHOD__ );
        }
 
@@ -2017,8 +2027,7 @@ class WikiPage extends Page {
         */
        public function createUpdates( $rev ) {
                global $wgUser;
-               $this->doEditUpdates( $rev->getText(), $wgUser, $rev->getComment(),
-                       $rev->isMinor(), $rev->getId(), true, true );
+               $this->doEditUpdates( $rev, $wgUser, array( 'created' => true ) );
        }
 
        /**
@@ -2416,17 +2425,6 @@ class WikiPage extends Page {
                return $this->doQuickEdit( $text, $wgUser, $comment, $minor );
        }
 
-       /*
-       * @deprecated since 1.19
-       */
-       public function editUpdates(
-               $text, $summary, $minoredit, $timestamp_of_pagechange, $newid,
-               $changed = true, User $user = null, $created = false
-       ) {
-               global $wgUser;
-               return $this->doEditUpdates( $text, $wgUser, $summary, $minoredit, $newid, $changed, $created );
-       }
-
        /*
        * @deprecated since 1.19
        */

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 0d8ad07..910f381 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -532,23 +532,18 @@ class PageArchive {
                }
 
                $created = (bool)$newid;
+               $oldcountable = $article->isCountable();
 
                // Attach the latest revision to the page...
                $wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId );
                if ( $created || $wasnew ) {
                        // Update site stats, link tables, etc
-                       $article->editUpdates( $revision->getText(), $revision->getComment(),
-                               $revision->isMinor(), wfTimestamp(), $revision->getId(), true, null, $created );
+                       $user = User::newFromName( $revision->getRawUserText() );
+                       $article->doEditUpdates( $revision, $user, array( 'created' => $created, 'oldcountable' => $oldcountable ) );
                }
 
                wfRunHooks( 'ArticleUndelete', array( &$this->title, $created, $comment ) );
 
-               if( $created ) {
-                       Article::onArticleCreate( $this->title );
-               } else {
-                       Article::onArticleEdit( $this->title );
-               }
-
                if( $this->title->getNamespace() == NS_FILE ) {
                        $update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
                        $update->doUpdate();