From 0358d19562d66258f7d0f858a2c9a7e774b4a2f8 Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Fri, 20 May 2016 11:26:53 +0100
Subject: [PATCH] Count subject and talk page conflict separately

Bug: T136547
Change-Id: If8b3dcd1d97f72058d281602242d2c44c38a48d0
---
 includes/EditPage.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7fb71f7291..2a80ea68d8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3513,6 +3513,14 @@ HTML
 		if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, &$wgOut ] ) ) {
 			$stats = $wgOut->getContext()->getStats();
 			$stats->increment( 'edit.failures.conflict' );
+			if ( $this->mTitle->isTalkPage() ) {
+				$stats->increment( 'edit.failures.conflict.byType.talk' );
+			} else {
+				$stats->increment( 'edit.failures.conflict.byType.subject' );
+			}
+			if ( $this->mTitle->getNamespace() === NS_PROJECT ) {
+				$stats->increment( 'edit.failures.conflict.byNamespace.project' );
+			}
 
 			$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
 
-- 
2.20.1