Merge pull request #1829 from keithbentrup/development

Must send HTTP headers before html
This commit is contained in:
Mark Drobnak 2017-12-13 13:37:32 -05:00 committed by GitHub
commit e3fa06d7ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -213,6 +213,8 @@ if (explode("-", $phVersion)[1] != "0")
// Please Note: Text is added via CSS to allow an admin to provide a localised // Please Note: Text is added via CSS to allow an admin to provide a localised
// language without the need to edit this file // language without the need to edit this file
setHeader();
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<!-- Pi-hole: A black hole for Internet advertisements <!-- Pi-hole: A black hole for Internet advertisements
@ -224,7 +226,6 @@ if (explode("-", $phVersion)[1] != "0")
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<?=$viewPort ?> <?=$viewPort ?>
<?=setHeader() ?>
<meta name="robots" content="noindex,nofollow"/> <meta name="robots" content="noindex,nofollow"/>
<meta http-equiv="x-dns-prefetch-control" content="off"> <meta http-equiv="x-dns-prefetch-control" content="off">
<link rel="shortcut icon" href="<?=$proto ?>://pi.hole/admin/img/favicon.png" type="image/x-icon"/> <link rel="shortcut icon" href="<?=$proto ?>://pi.hole/admin/img/favicon.png" type="image/x-icon"/>