From b855a16b8a65fabd43bf28357d95fc50e09a4c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Cla=C3=9Fen?= Date: Thu, 12 Apr 2018 19:13:22 +0200 Subject: [PATCH] GH-934: When Ghostery is installed in the Cliqz Browser, do not load the human-web and offers modules. --- src/background.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/background.js b/src/background.js index 2382bd142..b5b1e18dd 100644 --- a/src/background.js +++ b/src/background.js @@ -1324,14 +1324,14 @@ function initializeGhosteryModules() { conf.enable_anti_tracking = false; setCliqzModuleEnabled(antitracking, conf.enable_anti_tracking); setCliqzModuleEnabled(adblocker, conf.enable_ad_block); - setCliqzModuleEnabled(humanweb, IS_EDGE ? false : conf.enable_human_web); + setCliqzModuleEnabled(humanweb, (IS_EDGE || IS_CLIQZ) ? false : conf.enable_human_web); } else { conf.enable_ad_block = !adblocker.isDisabled; conf.enable_anti_tracking = !antitracking.isDisabled; - conf.enable_human_web = IS_EDGE ? false : !humanweb.isDisabled; + conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : !humanweb.isDisabled; } // sync conf from module status - conf.enable_offers = IS_EDGE ? false : !offers.isDisabled; + conf.enable_offers = (IS_EDGE || IS_CLIQZ) ? false : !offers.isDisabled; })).catch((e) => { log('cliqzStartup error', e); });