should provide the expected transparency here and fits usage patterns better.
* 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 ===
$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 {