Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369828 )

Change subject: RCFilters: Prevent live update fetch if model is in conflict
......................................................................

RCFilters: Prevent live update fetch if model is in conflict

Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/369828/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 16822d8..f3ea248 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -540,6 +540,7 @@
                        new mw.Uri().query.liveupdate;
 
                return !document.hidden &&
+                       !this.filtersModel.hasConflict() &&
                        !this.changesListModel.getNewChangesExist() &&
                        !this.updatingChangesList &&
                        liveUpdateFeatureFlag;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>

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

Reply via email to