mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-19 09:22:40 +02:00
Fix look-up of specific-generic filters entity-less hostnames
Related feedback: - https://github.com/uBlockOrigin/uBlock-issues/issues/688#issuecomment-743755956
This commit is contained in:
parent
c45b93a25c
commit
b22cf24bd5
@ -368,12 +368,14 @@
|
|||||||
hostname,
|
hostname,
|
||||||
[ plains, exceptions, procedurals, exceptions ]
|
[ plains, exceptions, procedurals, exceptions ]
|
||||||
);
|
);
|
||||||
if ( details.entity !== '' ) {
|
const entity = details.entity !== ''
|
||||||
|
? `${hostname.slice(0, -details.domain.length)}${details.entity}`
|
||||||
|
: '*';
|
||||||
filterDB.retrieve(
|
filterDB.retrieve(
|
||||||
`${hostname.slice(0, -details.domain.length)}${details.entity}`,
|
entity,
|
||||||
[ plains, exceptions, procedurals, exceptions ]
|
[ plains, exceptions, procedurals, exceptions ],
|
||||||
|
1
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
if ( plains.size === 0 && procedurals.size === 0 ) { return; }
|
if ( plains.size === 0 && procedurals.size === 0 ) { return; }
|
||||||
|
|
||||||
|
@ -318,12 +318,10 @@
|
|||||||
sessionScriptletDB.retrieve([ null, $exceptions ]);
|
sessionScriptletDB.retrieve([ null, $exceptions ]);
|
||||||
}
|
}
|
||||||
scriptletDB.retrieve(hostname, [ $scriptlets, $exceptions ]);
|
scriptletDB.retrieve(hostname, [ $scriptlets, $exceptions ]);
|
||||||
if ( request.entity !== '' ) {
|
const entity = request.entity !== ''
|
||||||
scriptletDB.retrieve(
|
? `${hostname.slice(0, -request.domain.length)}${request.entity}`
|
||||||
`${hostname.slice(0, -request.domain.length)}${request.entity}`,
|
: '*';
|
||||||
[ $scriptlets, $exceptions ]
|
scriptletDB.retrieve(entity, [ $scriptlets, $exceptions ], 1);
|
||||||
);
|
|
||||||
}
|
|
||||||
if ( $scriptlets.size === 0 ) { return; }
|
if ( $scriptlets.size === 0 ) { return; }
|
||||||
|
|
||||||
const loggerEnabled = µb.logger.enabled;
|
const loggerEnabled = µb.logger.enabled;
|
||||||
|
Loading…
Reference in New Issue
Block a user