Issue 6832 - Easylist was not re-added if the anti-circumvention list existed

lib/subscriptionInit.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 57 matching lines @@
  * data corruption or misconfiguration.
  *
  * @return {boolean}
  */
 function shouldAddDefaultSubscriptions()
 {
   for (let subscription of FilterStorage.subscriptions)
   {
     if (subscription instanceof DownloadableSubscription &&
         subscription.url != Prefs.subscriptions_exceptionsurl &&
-        subscription.url != Prefs.subscriptions_antiadblockurl)
+        subscription.url != Prefs.subscriptions_antiadblockurl &&
+        subscription.type != "circumvention")
       return false;
 
     if (subscription instanceof SpecialSubscription &&
         subscription.filters.length > 0)
       return false;
   }
-

[Sebastian Noack, 2018/08/02 22:47:41]

Nit: Unrelated change.

[hub, 2018/08/02 22:59:24]

Done.

   return true;
 }
 
 /**
  * @typedef {object} DefaultSubscriptions
  * @property {?Element} ads
  * @property {?Element} circumvention
  */
 /**
  * Finds the elements for the default ad blocking filter subscriptions based
@@ skipping 237 matching lines @@
  *
  * @param {function} callback
  */
 exports.setSubscriptionsCallback = callback =>
 {
   subscriptionsCallback = callback;
 };
 
 // Exports for tests only
 exports.chooseFilterSubscriptions = chooseFilterSubscriptions;