* Use content-lang for sitenotice
* (bug 4233) Update LanguageJa.php
* Fix regression: old version missing from edit links in Nostalgia skin
+* (bug 1600) Trigger edit conflict on duplicate section=new submissions
=== Caveats ===
$this->mArticle->clear(); # Force reload of dates, etc.
$this->mArticle->forUpdate( true ); # Lock the article
-
- if( ( $this->section != 'new' ) &&
- ($this->mArticle->getTimestamp() != $this->edittime ) )
- {
+
+ if( $this->mArticle->getTimestamp() != $this->edittime ) {
$this->isConflict = true;
+ if( $this->section = 'new' ) {
+ if( $this->mArticle->getUserText() == $wgUser->getName() &&
+ $this->mArticle->getComment() == $this->summary ) {
+ // Probably a duplicate submission of a new comment.
+ // This can happen when squid resends a request after
+ // a timeout but the first one actually went through.
+ wfDebug( "EditPage::editForm duplicate new section submission; trigger edit conflict!\n" );
+ } else {
+ // New comment; suppress conflict.
+ $this->isConflict = false;
+ wfDebug( "EditPage::editForm conflict suppressed; new section\n" );
+ }
+ }
}
$userid = $wgUser->getID();