Merge "RollbackAction/SpecialUndelete: Use OutputPage::addWikiMsg() where possible"

[lhc/web/wiklou.git] / includes / actions / RollbackAction.php

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index 9d336e4..c962e20 100644 (file)
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -69,6 +69,11 @@ class RollbackAction extends FormlessAction {
                        ] );
                }
 
+               // @TODO: remove this hack once rollback uses POST (T88044)
+               $trxLimits = $this->context->getConfig()->get( 'TrxProfilerLimits' );
+               $trxProfiler = Profiler::instance()->getTransactionProfiler();
+               $trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
+
                $data = null;
                $errors = $this->page->doRollback(
                        $from,
@@ -96,8 +101,12 @@ class RollbackAction extends FormlessAction {
                                $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() )
+                                               )
+                                       );
                                }
                        }
 
@@ -151,7 +160,6 @@ class RollbackAction extends FormlessAction {
                        );
                        $de->showDiff( '', '' );
                }
-               return;
        }
 
        protected function getDescription() {