X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=includes%2FEditPage.php;h=745f8deb6ee3ffcb3a5994f74c8903807ff462a3;hb=1f83b424294a6fd78cb73cf43db3464ca7481774;hp=ca1486436af7118b785687ddac1e0a3b547ac252;hpb=10a4b17a60b1ee041b8f8a4e6961644893883590;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index ca1486436a..745f8deb6e 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2326,9 +2326,12 @@ class EditPage {
 	}
 
 	function setHeaders() {
-		global $wgOut, $wgUser, $wgAjaxEditStash;
+		global $wgOut, $wgUser, $wgAjaxEditStash, $wgCookieSetOnAutoblock;
 
 		$wgOut->addModules( 'mediawiki.action.edit' );
+		if ( $wgCookieSetOnAutoblock === true ) {
+			$wgOut->addModules( 'mediawiki.user.blockcookie' );
+		}
 		$wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
 
 		if ( $wgUser->getOption( 'showtoolbar' ) ) {
@@ -3407,6 +3410,7 @@ HTML
 	 *
 	 * @param Title $title
 	 * @param string $format Output format, valid values are any function of a Message object
+	 * @param Language|string|null $langcode Language code or Language object.
 	 * @return string
 	 */
 	public static function getCopyrightWarning( $title, $format = 'plain', $langcode = null ) {
@@ -3534,7 +3538,7 @@ HTML
 		global $wgOut;
 
 		if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, &$wgOut ] ) ) {
-			$stats = $wgOut->getContext()->getStats();
+			$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
 			$stats->increment( 'edit.failures.conflict' );
 			// Only include 'standard' namespaces to avoid creating unknown numbers of statsd metrics
 			if (
@@ -3673,7 +3677,7 @@ HTML
 		global $wgOut, $wgRawHtml, $wgLang;
 		global $wgAllowUserCss, $wgAllowUserJs;
 
-		$stats = $wgOut->getContext()->getStats();
+		$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
 
 		if ( $wgRawHtml && !$this->mTokenOk ) {
 			// Could be an offsite preview attempt. This is very unsafe if
@@ -4067,7 +4071,7 @@ HTML
 
 	/**
 	 * Returns an array of html code of the following buttons:
-	 * save, diff, preview and live
+	 * save, diff and preview
 	 *
 	 * @param int $tabindex Current tabindex
 	 *
@@ -4101,7 +4105,6 @@ HTML
 		] + Linker::tooltipAndAccesskeyAttribs( 'preview' );
 		$buttons['preview'] = Html::submitButton( $this->context->msg( 'showpreview' )->text(),
 			$attribs );
-		$buttons['live'] = '';
 
 		$attribs = [
 			'id' => 'wpDiff',