Count subject and talk page conflict separately

Bug: T136547
Change-Id: If8b3dcd1d97f72058d281602242d2c44c38a48d0

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7fb71f7..2a80ea6 100644 (file)
--- 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" );