Issue 3254 - Anti-adblock warning should not show when Adblock Plus is disabled

lib/notification.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 209 matching lines @@
         if (Prefs.enabled && typeof url === "string" && notification.urlFilters instanceof Array)
         {
           let host = (typeof URL == "function" ? new URL(url).hostname : Utils.makeURI(url).host);
           let exception = defaultMatcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host, false, null);
           if (exception instanceof WhitelistFilter)
             continue;
 
           let matcher = new Matcher();
           for (let urlFilter of notification.urlFilters)
             matcher.add(Filter.fromText(urlFilter));
-          if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, null, false, null))

[Thomas Greiner, 2015/11/02 13:59:38]

Any reason why you don't pass the domain here like you do above?

[Wladimir Palant, 2015/11/02 14:10:31]

No good reason actually, fixed.

+          if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host, false, null))
             continue;
         }
         else
           continue;
       }
 
       if (notification.targets instanceof Array)
       {
         let match = false;
         for (let target of notification.targets)
@@ skipping 148 matching lines @@
       Prefs.notifications_showui = true;
     }
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a different object.
     Prefs.notifications_ignoredcategories = JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();