dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Soft deprecate Title::getUserCaseDBKey()"
[lhc/web/wiklou.git]
/
includes
/
actions
/
RollbackAction.php
diff --git
a/includes/actions/RollbackAction.php
b/includes/actions/RollbackAction.php
index
7b41262
..
03a5bc8
100644
(file)
--- a/
includes/actions/RollbackAction.php
+++ b/
includes/actions/RollbackAction.php
@@
-70,9
+70,13
@@
class RollbackAction extends FormlessAction {
}
// @TODO: remove this hack once rollback uses POST (T88044)
}
// @TODO: remove this hack once rollback uses POST (T88044)
+ $fname = __METHOD__;
$trxLimits = $this->context->getConfig()->get( 'TrxProfilerLimits' );
$trxProfiler = Profiler::instance()->getTransactionProfiler();
$trxLimits = $this->context->getConfig()->get( 'TrxProfilerLimits' );
$trxProfiler = Profiler::instance()->getTransactionProfiler();
- $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
+ $trxProfiler->redefineExpectations( $trxLimits['POST'], $fname );
+ DeferredUpdates::addCallableUpdate( function () use ( $trxProfiler, $trxLimits, $fname ) {
+ $trxProfiler->redefineExpectations( $trxLimits['PostSend-POST'], $fname );
+ } );
$data = null;
$errors = $this->page->doRollback(
$data = null;
$errors = $this->page->doRollback(
@@
-101,8
+105,12
@@
class RollbackAction extends FormlessAction {
$current = $data['current'];
if ( $current->getComment() != '' ) {
$current = $data['current'];
if ( $current->getComment() != '' ) {
- $this->getOutput()->addHTML( $this->msg( 'editcomment' )->rawParams(
- Linker::formatComment( $current->getComment() ) )->parse() );
+ $this->getOutput()->addWikiMsg(
+ 'editcomment',
+ Message::rawParam(
+ Linker::formatComment( $current->getComment() )
+ )
+ );
}
}
}
}