From: WMDE-Fisch <christoph.jauera@wikimedia.de>
Date: Fri, 11 Nov 2016 16:48:02 +0000 (+0100)
Subject: Get StatsdDataFactory from MediaWikiServices
X-Git-Tag: 1.31.0-rc.0~4888^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=b829bdece246bd083f7c63c63a0c333cbb210de7;p=lhc%2Fweb%2Fwiklou.git

Get StatsdDataFactory from MediaWikiServices

Change-Id: Ia4a32e7932299168649b6472f503249630fd7c1e
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index ca1486436a..5b0bc8a615 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3534,7 +3534,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 +3673,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