jenkins-bot has submitted this change and it was merged.

Change subject: In the event of a document reload due to RB vs. API rev ID 
conflict, always re-set requestedRevId
......................................................................


In the event of a document reload due to RB vs. API rev ID conflict, always 
re-set requestedRevId

There's probably more to this bug but I think we should still correct this

Bug: T125437
Change-Id: Ib32d1e69b2500578b5dc160c0c2d7481f5577ebb
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index a2ad144..e907f17 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -231,9 +231,7 @@
                                // the request that gave us the lower revid
                                this.loading = false;
                                // HACK: Load with explicit revid to hopefully 
prevent this from happening again
-                               if ( !this.requestedRevId ) {
-                                       this.requestedRevId = Math.max( 
docRevId, this.revid );
-                               }
+                               this.requestedRevId = Math.max( docRevId, 
this.revid );
                                this.load();
                        }
                        return;

-- 
To view, visit https://gerrit.wikimedia.org/r/276933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32d1e69b2500578b5dc160c0c2d7481f5577ebb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to