This commit is contained in:
gorhill 2015-09-13 10:26:36 -04:00
parent 45415a8de6
commit 90a2c608bb
2 changed files with 6 additions and 2 deletions

View file

@ -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",

View file

@ -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;
}