Issue 4774 - 'Block ads on this page' does not remove whitelisting when re-selected

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 18 matching lines @@
     "@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest");
 
 function require(module)
 {
   let result = {};
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
   return result.exports;
 }
 
-let {Filter} = require("filterClasses");
+let {Filter, RegExpFilter} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {FilterStorage} = require("filterStorage");
 let {defaultMatcher} = require("matcher");
 let {Prefs} = require("prefs");
 let {Subscription, SpecialSubscription, RegularSubscription, DownloadableSubscription, ExternalSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {UI} = require("ui");
 
 let subscriptionsSavedPref = "subscriptions_saved";
 
@@ skipping 46 matching lines @@
   let branchName = "extensions." + addonName + ".";
   return Services.prefs.getBranch(branchName);
 }
 
 function getWhitelistingFilter(url)
 {
   let uriObject = Services.io.newURI(url, null, null);
   try
   {
     return defaultMatcher.whitelist.matchesAny(
-      uriObject.spec, "DOCUMENT", uriObject.host, false, null);
+      uriObject.spec, RegExpFilter.typeMap.DOCUMENT, uriObject.host, false, null, false);
   }
   catch (e)
   {
     return null;
   }
 }
 
 var AdblockPlusApi =
 {
   get filtersLoaded()
@@ skipping 179 matching lines @@
           {
             this.whitelistSite(data["url"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };