diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-12 17:03:51 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-12 17:03:51 +0000 |
| commit | 73ed4ae8513af1cc6e795b125cc1f319a965bfb4 (patch) | |
| tree | 86681c6baee8869faab58940588251be692dd9e4 /engine | |
| parent | c41553d5e532ca86070d511d50d150d97869bb84 (diff) | |
| download | elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.gz elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.bz2 | |
Merged Cash's bugfixes from the 1.7 branch (3288:5377).
git-svn-id: http://code.elgg.org/elgg/trunk@5378 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/elgglib.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index ac46df078..95292a2d7 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2374,7 +2374,7 @@ function elgg_normalise_plural_options_array($options, $singulars) { function full_url() { $s = empty($_SERVER["HTTPS"]) ? '' : ($_SERVER["HTTPS"] == "on") ? "s" : ""; $protocol = substr(strtolower($_SERVER["SERVER_PROTOCOL"]), 0, strpos(strtolower($_SERVER["SERVER_PROTOCOL"]), "/")) . $s; - $port = ($_SERVER["SERVER_PORT"] == "80") ? "" : (":".$_SERVER["SERVER_PORT"]); + $port = ($_SERVER["SERVER_PORT"] == "80" || $_SERVER["SERVER_PORT"] == "443") ? "" : (":".$_SERVER["SERVER_PORT"]); return $protocol . "://" . $_SERVER['SERVER_NAME'] . $port . $_SERVER['REQUEST_URI']; } |