Merge "rdbms: add setTempTablesOnlyMode() to suppress CONN_TRX_AUTOCOMMIT during...

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

diff --git a/includes/actions/RevertAction.php b/includes/actions/RevertAction.php
index a914c9b..8a5d7c9 100644 (file)
--- a/includes/actions/RevertAction.php
+++ b/includes/actions/RevertAction.php
@@ -23,6 +23,8 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * File reversion user interface
  *
@@ -78,8 +80,6 @@ class RevertAction extends FormAction {
        }
 
        protected function getFormFields() {
-               global $wgContLang;
-
                $timestamp = $this->oldFile->getTimestamp();
 
                $user = $this->getUser();
@@ -88,8 +88,9 @@ class RevertAction extends FormAction {
                $userTime = $lang->userTime( $timestamp, $user );
                $siteTs = MWTimestamp::getLocalInstance( $timestamp );
                $ts = $siteTs->format( 'YmdHis' );
-               $siteDate = $wgContLang->date( $ts, false, false );
-               $siteTime = $wgContLang->time( $ts, false, false );
+               $contLang = MediaWikiServices::getInstance()->getContentLanguage();
+               $siteDate = $contLang->date( $ts, false, false );
+               $siteTime = $contLang->time( $ts, false, false );
                $tzMsg = $siteTs->getTimezoneMessage()->inContentLanguage()->text();
 
                return [
@@ -135,7 +136,10 @@ class RevertAction extends FormAction {
                        0,
                        false,
                        false,
-                       $this->getUser()
+                       $this->getUser(),
+                       [],
+                       true,
+                       true
                );
        }