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

adblockplus/Api.jsm

Index: adblockplus/Api.jsm
===================================================================
--- a/adblockplus/Api.jsm
+++ b/adblockplus/Api.jsm
@@ -31,17 +31,17 @@ let XMLHttpRequest = Components.Construc
 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");
 
@@ -98,17 +98,17 @@ function getPrefsBranch()
 }
 
 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 =