From: Moriel Schottlender <moriel@gmail.com>
Date: Thu, 3 Aug 2017 02:30:48 +0000 (-0700)
Subject: RCFilters: Prevent live update fetch if model is in conflict
X-Git-Tag: 1.31.0-rc.0~2488^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=c9eadaecf265472309eaff3a98bbb424a4d8a812;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Prevent live update fetch if model is in conflict

Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 16822d8810..f3ea248b4d 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;