From: addshore <addshorewiki@gmail.com>
Date: Sun, 26 Feb 2017 16:50:21 +0000 (+0000)
Subject: Make EditPage::incrementConflictStats protected
X-Git-Tag: 1.31.0-rc.0~3952^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=5cd19c7f70942dfd45bf20a3e2ff3d218137de73;p=lhc%2Fweb%2Fwiklou.git

Make EditPage::incrementConflictStats protected

This will be overridden by the TwoColConflict
extension & beta feature...

Bug: T158754
Change-Id: Ia0099540032da2d490b2a8eee82a7ae70eff0f9e
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 34062c0621..f9bb3cd346 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3563,7 +3563,7 @@ HTML
 		}
 	}
 
-	private function incrementConflictStats() {
+	protected function incrementConflictStats() {
 		$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
 		$stats->increment( 'edit.failures.conflict' );
 		// Only include 'standard' namespaces to avoid creating unknown numbers of statsd metrics