From 2f037e6f72fe21c4c4d4eac3c4db81a86203164a Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 16 Mar 2016 12:11:37 -0400 Subject: [PATCH] #1477: put back mistakenly removed block of code --- src/js/static-net-filtering.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index 332892ba1..c8b432321 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -2354,6 +2354,27 @@ FilterContainer.prototype.matchStringExactType = function(context, requestURL, r } } + // Test against block filters + key = BlockAnyParty | type; + if ( (bucket = categories[toHex(key)]) ) { + if ( this.matchTokens(bucket, url) ) { + this.keyRegister = key; + } + } + if ( this.fRegister === null ) { + key = BlockAction | type | party; + if ( (bucket = categories[toHex(key)]) ) { + if ( this.matchTokens(bucket, url) ) { + this.keyRegister = key; + } + } + } + + // If there is no block filter, no need to test against allow filters + if ( this.fRegister === null ) { + return undefined; + } + // Test against allow filters key = AllowAnyParty | type; if ( (bucket = categories[toHex(key)]) ) {