Merge "mediawiki.page.patrol.ajax: Rename file to match module name"

[lhc/web/wiklou.git] / includes / MovePage.php

diff --git a/includes/MovePage.php b/includes/MovePage.php
index b918955..fb0ca8c 100644 (file)
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -252,7 +252,7 @@ class MovePage {
                $protected = $this->oldTitle->isProtected();
 
                // Do the actual move
-               $this->moveToInternal( $user, $this->newTitle, $reason, $createRedirect );
+               $nullRevision = $this->moveToInternal( $user, $this->newTitle, $reason, $createRedirect );
 
                // Refresh the sortkey for this row.  Be careful to avoid resetting
                // cl_timestamp, which may disturb time-based lists on some sites.
@@ -371,12 +371,21 @@ class MovePage {
 
                Hooks::run(
                        'TitleMoveCompleting',
-                       array( $this->oldTitle, $this->newTitle, $user, $pageid, $redirid, $reason )
+                       array( $this->oldTitle, $this->newTitle,
+                               $user, $pageid, $redirid, $reason, $nullRevision )
                );
 
                $dbw->endAtomic( __METHOD__ );
 
-               $params = array( &$this->oldTitle, &$this->newTitle, &$user, $pageid, $redirid, $reason );
+               $params = array(
+                       &$this->oldTitle,
+                       &$this->newTitle,
+                       &$user,
+                       $pageid,
+                       $redirid,
+                       $reason,
+                       $nullRevision
+               );
                $dbw->onTransactionIdle( function () use ( $params, $dbw ) {
                        // Keep each single hook handler atomic
                        $dbw->setFlag( DBO_TRX ); // flag is automatically reset by DB layer
@@ -396,6 +405,7 @@ class MovePage {
         * @param string $reason The reason for the move
         * @param bool $createRedirect Whether to leave a redirect at the old title. Does not check
         *   if the user has the suppressredirect right
+        * @return Revision the revision created by the move
         * @throws MWException
         */
        private function moveToInternal( User $user, &$nt, $reason = '', $createRedirect = true ) {
@@ -552,5 +562,7 @@ class MovePage {
                # Log the move
                $logid = $logEntry->insert();
                $logEntry->publish( $logid );
+
+               return $nullRevision;
        }
 }