jenkins-bot has submitted this change and it was merged.
Change subject: Fallback to read from master in
DifferenceEngine::loadRevisionData
......................................................................
Fallback to read from master in DifferenceEngine::loadRevisionData
In DifferenceEngine we need to show a diff immediately after
an edit happened if someone did a rollback. To make that work
again, try loading a revision from master if we have more than
one database servers and we failed loading the revision from
a slave.
Change-Id: I08a16faa9e637c614c6d2fc9a10536c7b41685a8
Follows: 3c2bc32ae1775f5e875958b62d7181b4b5cfe24e
Bug: T93866
---
M includes/diff/DifferenceEngine.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index 77bbd36..de8dd43 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -1233,6 +1233,12 @@
// Load the new revision object
if ( $this->mNewid ) {
$this->mNewRev = Revision::newFromId( $this->mNewid );
+
+ if ( !$this->mNewRev && wfGetLB()->getServerCount() > 1
) {
+ // Try harder… This is being hit after a
rollback where we show the
+ // diff immediately after the edit happened.
T93866
+ $this->mNewRev = Revision::newFromId(
$this->mNewid, Revision::READ_LATEST );
+ }
} else {
$this->mNewRev = Revision::newFromTitle(
$this->getTitle(),
--
To view, visit https://gerrit.wikimedia.org/r/199609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08a16faa9e637c614c6d2fc9a10536c7b41685a8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
