Merge "SpecialPagesWithProp: Use 'combobox' field and convert to OOUI"

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

diff --git a/includes/MovePage.php b/includes/MovePage.php
index 0f9374a..b918955 100644 (file)
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -369,10 +369,17 @@ class MovePage {
                        WatchedItem::duplicateEntries( $this->oldTitle, $this->newTitle );
                }
 
+               Hooks::run(
+                       'TitleMoveCompleting',
+                       array( $this->oldTitle, $this->newTitle, $user, $pageid, $redirid, $reason )
+               );
+
                $dbw->endAtomic( __METHOD__ );
 
-               $params = array( $this->oldTitle, $this->newTitle, $user, $pageid, $redirid, $reason );
-               $dbw->onTransactionIdle( function () use ( $params ) {
+               $params = array( &$this->oldTitle, &$this->newTitle, &$user, $pageid, $redirid, $reason );
+               $dbw->onTransactionIdle( function () use ( $params, $dbw ) {
+                       // Keep each single hook handler atomic
+                       $dbw->setFlag( DBO_TRX ); // flag is automatically reset by DB layer
                        Hooks::run( 'TitleMoveComplete', $params );
                } );