Merge remote-tracking branch 'origin/development' into ipv6_brackets

Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
2018-08-22 09:12:15 +02:00
parent 048e5bb9a2 b9d47d0dd2
commit 85cf98888d
11 changed files with 91 additions and 42 deletions
@@ -8,7 +8,7 @@

 // Sanitise HTTP_HOST output
 $serverName = htmlspecialchars($_SERVER["HTTP_HOST"]);
-// Remove external ipv6 brackets if any 
+// Remove external ipv6 brackets if any
 $serverName = preg_replace('/^\[(.*)\]$/', '${1}', $serverName);

 if (!is_file("/etc/pihole/setupVars.conf"))