WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361819 )

Change subject: Log resolved conflicts
......................................................................

Log resolved conflicts

Bug: T167863
Change-Id: I48bbfc7216d1f726dbcec3ae337466bbf8b2a486
---
M includes/EditPage.php
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/361819/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6be8771..2816ca3 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1494,6 +1494,20 @@
        }
 
        /**
+        * Log when a page was successfully saved after the edit conflict view
+        */
+       private function logResolvedConflicts() {
+               global $wgRequest;
+
+               if ( $wgRequest->getText( 'mode' ) !== 'conflict' ) {
+                       return;
+               }
+
+               $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+               $stats->increment( 'edit.failures.conflict.resolved' );
+       }
+
+       /**
         * Handle status, such as after attempt save
         *
         * @param Status $status
@@ -1512,6 +1526,8 @@
                if ( $status->value == self::AS_SUCCESS_UPDATE
                        || $status->value == self::AS_SUCCESS_NEW_ARTICLE
                ) {
+                       $this->logResolvedConflicts();
+
                        $this->didSave = true;
                        if ( !$resultDetails['nullEdit'] ) {
                                $this->setPostEditCookie( $status->value );

-- 
To view, visit https://gerrit.wikimedia.org/r/361819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48bbfc7216d1f726dbcec3ae337466bbf8b2a486
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to