RCFilters: Unify reading filters by views and adjust unit tests

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / dm / mw.rcfilters.dm.FilterGroup.js

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index d3fb66e..c1a936d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -89,13 +89,13 @@
                                        identifiers: filter.identifiers
                                } );
 
-                       filter.subset = filter.subset || [];
-                       filter.subset = filter.subset.map( function ( el ) {
-                               return el.filter;
-                       } );
-
                        if ( filter.subset ) {
+                               filter.subset = filter.subset.map( function ( el ) {
+                                       return el.filter;
+                               } );
+
                                subsetNames = [];
+
                                filter.subset.forEach( function ( subsetFilterName ) { // eslint-disable-line no-loop-func
                                        // Subsets (unlike conflicts) are always inside the same group
                                        // We can re-map the names of the filters we are getting from