* Don't override edit conflict suppression on section edits; section merging

  should provide the expected transparency here and fits usage patterns better.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6224efc..b5cf346 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -75,6 +75,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * Security fix for <math>
 * Security fix for tables
 * Security fix for Special:Upload license selection list
+* Don't override edit conflict suppression on section edits; section merging
+  should provide the expected transparency here and fits usage patterns better.
 
 
 === Caveats ===

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5efe8c0..163a08a 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -516,8 +516,8 @@ class EditPage {
                        $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary);
                }
 
-               # Suppress edit conflict with self
-               if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
+               # Suppress edit conflict with self, except for section edits where merging is required.
+               if ( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
                        wfDebug( "Suppressing edit conflict, same user.\n" );
                        $this->isConflict = false;
                } else {