Index: lib/filterComposer.js |
=================================================================== |
--- a/lib/filterComposer.js |
+++ b/lib/filterComposer.js |
@@ -23,7 +23,7 @@ |
const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
const {Prefs} = require("./prefs"); |
-const {extractHostFromFrame, stringifyURL, isThirdParty} = require("./url"); |
+const {extractHostFromFrame, isThirdParty} = require("./url"); |
const {getKey, checkWhitelisted} = require("./whitelisting"); |
const {port} = require("./messaging"); |
const info = require("../buildtools/info"); |
@@ -104,17 +104,15 @@ |
for (let url of details.urls) |
{ |
let urlObj = new URL(url, details.baseURL); |
- url = stringifyURL(urlObj); |
- |
let filter = defaultMatcher.whitelist.matchesAny( |
- url, typeMask, docDomain, |
+ urlObj.href, typeMask, docDomain, |
isThirdParty(urlObj, docDomain), |
getKey(page, frame), specificOnly |
); |
if (!filter) |
{ |
- let filterText = url.replace(/^[\w-]+:\/+(?:www\.)?/, "||"); |
+ let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||"); |
if (specificOnly) |
filterText += "$domain=" + docDomain; |