Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4657 from rdwebdesign/fix4656

Browse source 
Add check to avoid error in PHP 8 on the blocking page
This commit is contained in:
yubiuser 2022-03-22 00:37:57 +01:00 committed by GitHub
commit a48750e257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
advanced/index.php
View file

@ -170,7 +170,15 @@ function queryAds($serverName) {
$serverName $serverName
); );
$queryAds = file($queryAdsURL, FILE_IGNORE_NEW_LINES); $queryAds = file($queryAdsURL, FILE_IGNORE_NEW_LINES);
$queryAds = array_values(array_filter(preg_replace("/data:\s+/", "", $queryAds)));
// $queryAds must be an array (to avoid PHP 8.0+ error)
if (is_array($queryAds)) {
$queryAds = array_values(array_filter(preg_replace("/data:\s+/", "", $queryAds)));
} else {
// if not an array, return an error message
return array("0" => "error", "1" => "Not an array:<br>(".gettype($queryAds).")<br>".print_r($queryAds, true));
}
$queryTime = sprintf("%.0f", (microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"]) - $preQueryTime); $queryTime = sprintf("%.0f", (microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"]) - $preQueryTime);
// Exception Handling // Exception Handling