Merge "RevisionStore: Avoid exception on prev/next of deleted revision"

[lhc/web/wiklou.git] / includes / api / ApiRollback.php

diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index d2ff790..10ba478 100644 (file)
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -55,6 +55,14 @@ class ApiRollback extends ApiBase {
                        }
                }
 
+               // @TODO: remove this hack once rollback uses POST (T88044)
+               $trxLimits = $this->getConfig()->get( 'TrxProfilerLimits' );
+               $trxProfiler = Profiler::instance()->getTransactionProfiler();
+               $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
+               DeferredUpdates::addCallableUpdate( function () use ( $trxProfiler, $trxLimits ) {
+                       $trxProfiler->setExpectations( $trxLimits['PostSend-POST'], __METHOD__ );
+               } );
+
                $retval = $pageObj->doRollback(
                        $this->getRbUser( $params ),
                        $summary,
@@ -69,10 +77,7 @@ class ApiRollback extends ApiBase {
                        $this->dieStatus( $this->errorArrayToStatus( $retval, $user ) );
                }
 
-               $watch = 'preferences';
-               if ( isset( $params['watchlist'] ) ) {
-                       $watch = $params['watchlist'];
-               }
+               $watch = $params['watchlist'] ?? 'preferences';
 
                // Watch pages
                $this->setWatch( $watch, $titleObj, 'watchrollback' );