diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index c34addd9..1e6bf093 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -108,18 +108,6 @@ function refresh(fade) { }); }); } - - -/* - // Blacklist: exact + wildcard array - entry = entry.substr(1, entry.length - 1); - - if(data.length === 2) - { - } - else - { -*/ } list.fadeIn(100); if(listw) diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php index 2e3e7a60..e2a67a94 100644 --- a/scripts/pi-hole/php/get.php +++ b/scripts/pi-hole/php/get.php @@ -22,9 +22,9 @@ switch ($listtype) { break; case "black": - $exact = array(getListContent("blacklist.txt")); - $regex = array(getListContent("regex.list")); - $list = array_merge($exact, $regex); + $exact = getListContent("blacklist.txt"); + $regex = getListContent("regex.list"); + $list = array($exact, $regex); break; default: