Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94584
Change subject: (bug 56849) Pass true oldid for atomic page save
......................................................................
(bug 56849) Pass true oldid for atomic page save
This is necessary to detect edit conflicts without a race condition.
Change-Id: I25c39aca5280a0810f75d0481afc86d31ce9a812
---
M includes/EditPage.php
M includes/WikiPage.php
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/94584/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 68691c5..0604cbd 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1015,6 +1015,7 @@
return $handler->makeEmptyContent();
}
$content = $revision->getContent();
+ $this->oldid = $revision->getId();
return $content;
}
@@ -1769,7 +1770,7 @@
( $bot ? EDIT_FORCE_BOT : 0 );
$doEditStatus = $this->mArticle->doEditContent(
$content, $this->summary, $flags,
-
false, null, $this->contentFormat );
+
$this->oldid, null,
$this->contentFormat );
if ( !$doEditStatus->isOK() ) {
// Failure from doEdit()
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 576979c..35232ce 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1697,7 +1697,7 @@
$old_content = $this->getContent( Revision::RAW ); // current
revision's content
$oldsize = $old_content ? $old_content->getSize() : 0;
- $oldid = $this->getLatest();
+ $oldid = $baseRevId ? $baseRevId : $this->getLatest();
$oldIsRedirect = $this->isRedirect();
$oldcountable = $this->isCountable();
--
To view, visit https://gerrit.wikimedia.org/r/94584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c39aca5280a0810f75d0481afc86d31ce9a812
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
