Merge "qunit: Increase individual test timeout to 60 seconds"

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 58936e0..277a6cc 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1211,7 +1211,7 @@ class EditPage {
         * across a recoverable edit conflict, the ID of the newer revision to
         * which we have rebased this page.
         *
-        * @since 1.25
+        * @since 1.27
         * @return int Revision ID
         */
        public function getParentRevId() {
@@ -1849,7 +1849,7 @@ class EditPage {
                                                $this->page->getComment() == $this->newSectionSummary()
                                        ) {
                                                // Probably a duplicate submission of a new comment.
-                                               // This can happen when squid resends a request after
+                                               // This can happen when CDN resends a request after
                                                // a timeout but the first one actually went through.
                                                wfDebug( __METHOD__
                                                        . ": duplicate new section submission; trigger edit conflict!\n" );
@@ -3457,6 +3457,9 @@ HTML
                global $wgOut;
 
                if ( Hooks::run( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) {
+                       $stats = $wgOut->getContext()->getStats();
+                       $stats->increment( 'edit.failures.conflict' );
+
                        $wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
 
                        $content1 = $this->toEditContent( $this->textbox1 );