diff options
| author | rub <rub@piwigo.org> | 2007-08-30 05:32:37 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-08-30 05:32:37 +0000 |
| commit | 45fde2cc6b34d3acdfd43b487eb4b7dbeede05a8 (patch) | |
| tree | caeb1922d894e698a79370061c09986405c291dc | |
| parent | b85685c752f1dcd632919530c634432d2cdcf2e1 (diff) | |
Resolved 0000738: Double port on url
Merge branch-1_7 2048:2050 into BSF
git-svn-id: http://piwigo.org/svn/trunk@2083 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/functions_url.inc.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index 9e81a72cf..2d0a39f6d 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -61,9 +61,13 @@ function get_absolute_root_url($with_scheme=true) if ($with_scheme) { $url .= 'http://'.$_SERVER['HTTP_HOST']; - if ($_SERVER['SERVER_PORT']!=80) + if ($_SERVER['SERVER_PORT'] != 80) { - $url .= ':'.$_SERVER['SERVER_PORT']; + $url_port = ':'.$_SERVER['SERVER_PORT']; + if (strrchr($url, ':') != $url_port) + { + $url .= $url_port; + } } } $url .= cookie_path(); |