Merge pull request #2831 from pi-hole/fix/block-page-adlists

Fix block page errors due to gravity DB and changes to queryAds
This commit is contained in:
Mark Drobnak 2019-07-20 14:55:37 -04:00 committed by GitHub
commit ab3f6dfcc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 11 deletions

View file

@ -115,7 +115,9 @@ scanDatabaseTable() {
wbMatch=true
# Print table name
echo " ${matchType^} found in ${COL_BOLD}${table^}${COL_NC}"
if [[ -z "${blockpage}" ]]; then
echo " ${matchType^} found in ${COL_BOLD}${table^}${COL_NC}"
fi
# Loop over results and print them
mapfile -t results <<< "${result}"
@ -159,7 +161,7 @@ if [[ "${#regexList[@]}" -ne 0 ]]; then
# shellcheck disable=SC2001
echo "${str_result}" | sed 's/^/ /'
else
echo Regex list"
echo .wildcard"
exit 0
fi
fi