From 90a2c608bb6ebcce3579130316652c05ceebaa72 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 13 Sep 2015 10:26:36 -0400 Subject: [PATCH] this fixes #708 --- src/js/background.js | 3 ++- src/js/storage.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/background.js b/src/js/background.js index 5da45acaf..d14c827b5 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -142,7 +142,8 @@ return { remoteBlacklists: {}, oldListToNewListMap: { "assets/thirdparties/adblock.gardar.net/is.abp.txt": "http://adblock.gardar.net/is.abp.txt", - "assets/thirdparties/adblock.schack.dk/block.txt": "https://adblock.schack.dk/block.txt", + "assets/thirdparties/adblock.schack.dk/block.txt": "https://adblock.dk/block.csv", + "https://adblock.schack.dk/block.txt": "https://adblock.dk/block.csv", "assets/thirdparties/dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt": "https://dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt", "assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt": "https://easylist-downloads.adblockplus.org/advblock.txt", "assets/thirdparties/easylist-downloads.adblockplus.org/bitblock.txt": "https://easylist-downloads.adblockplus.org/bitblock.txt", diff --git a/src/js/storage.js b/src/js/storage.js index 6d2eedaf4..c7b5c4239 100644 --- a/src/js/storage.js +++ b/src/js/storage.js @@ -953,12 +953,15 @@ } // Migrate assets affected by the change to their new name. + var reExternalURL = /^https?:\/\//; var newListKey; for ( var oldListKey in stockLists ) { if ( stockLists.hasOwnProperty(oldListKey) === false ) { continue; } - oldListKey = 'assets/thirdparties/' + oldListKey; + if ( reExternalURL.test(oldListKey) === false ) { + oldListKey = 'assets/thirdparties/' + oldListKey; + } if ( µb.oldListToNewListMap.hasOwnProperty(oldListKey) === false ) { continue; }