From c6e870e5c6f85a693e01c0c16ce027b4b7e45480 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 2 Sep 2005 01:17:00 +0000 Subject: [PATCH] * Don't override edit conflict suppression on section edits; section merging should provide the expected transparency here and fits usage patterns better. --- RELEASE-NOTES | 2 ++ includes/EditPage.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6224efcd02..b5cf346a80 100644 --- 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 * 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 5efe8c026b..163a08ab68 100644 --- 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 { -- 2.20.1