Update RELEASE-NOTES-1.34 for various backports

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

diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index 78696da..7c313d5 100644 (file)
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -59,9 +59,9 @@ class ApiRollback extends ApiBase {
                $fname = __METHOD__;
                $trxLimits = $this->getConfig()->get( 'TrxProfilerLimits' );
                $trxProfiler = Profiler::instance()->getTransactionProfiler();
-               $trxProfiler->setExpectations( $trxLimits['POST'], $fname );
+               $trxProfiler->redefineExpectations( $trxLimits['POST'], $fname );
                DeferredUpdates::addCallableUpdate( function () use ( $trxProfiler, $trxLimits, $fname ) {
-                       $trxProfiler->setExpectations( $trxLimits['PostSend-POST'], $fname );
+                       $trxProfiler->redefineExpectations( $trxLimits['PostSend-POST'], $fname );
                } );
 
                $retval = $pageObj->doRollback(
@@ -85,13 +85,13 @@ class ApiRollback extends ApiBase {
 
                $info = [
                        'title' => $titleObj->getPrefixedText(),
-                       'pageid' => intval( $details['current']->getPage() ),
+                       'pageid' => (int)$details['current']->getPage(),
                        'summary' => $details['summary'],
-                       'revid' => intval( $details['newid'] ),
+                       'revid' => (int)$details['newid'],
                        // The revision being reverted (previously the current revision of the page)
-                       'old_revid' => intval( $details['current']->getID() ),
+                       'old_revid' => (int)$details['current']->getID(),
                        // The revision being restored (the last revision before revision(s) by the reverted user)
-                       'last_revid' => intval( $details['target']->getID() )
+                       'last_revid' => (int)$details['target']->getID()
                ];
 
                $this->getResult()->addValue( null, $this->getModuleName(), $info );