Loosen the check for port numbers in guessBaseHref. Fixes #796

NatLibFi · Sep 7, 2018 · 9bda271 · 9bda271
1 parent 14b681f
commit 9bda271
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/controller/Controller.php b/controller/Controller.php
@@ -94,7 +94,7 @@ private function guessBaseHref()
         $base_url = str_replace('/controller', '/', $base_url);
         $protocol = filter_input(INPUT_SERVER, 'HTTPS', FILTER_SANITIZE_STRING) === null ? 'http' : 'https';
         $port = filter_input(INPUT_SERVER, 'SERVER_PORT', FILTER_SANITIZE_STRING);
-        $disp_port = ($protocol == 'http' && $port == 80 || $protocol == 'https' && $port == 443) ? '' : ":$port";
+        $disp_port = ($port == 80 || $port == 443) ? '' : ":$port";
         $domain = filter_input(INPUT_SERVER, 'SERVER_NAME', FILTER_SANITIZE_STRING);
         $full_url = "$protocol://{$domain}{$disp_port}{$base_url}";
         return $full_url;