diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/minz/Url.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/minz/Url.php b/lib/minz/Url.php index 9bda98363..4a703e64b 100755 --- a/lib/minz/Url.php +++ b/lib/minz/Url.php @@ -22,11 +22,14 @@ class Url { $url_string = ''; if ($absolute) { - $protocol = (is_array ($url) && isset ($url['protocol'])) ? ($url['protocol'] . ':') : ''; //Empty protocol will use automatic http or https - $url_string = $protocol - . '//' - . Request::getDomainName () - . Request::getBaseUrl (); + if (is_array ($url) && isset ($url['protocol'])) { + $protocol = $url['protocol']; + } elseif (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { + $protocol = 'https:'; + } else { + $protocol = 'http:'; + } + $url_string = $protocol . '//' . Request::getDomainName () . Request::getBaseUrl (); } else { $url_string = '.'; |