diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-02-25 15:32:41 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-02-25 15:32:41 +0400 |
| commit | 678afc4906382e8b7c18d4acf3b024b14c0c85aa (patch) | |
| tree | 864aaa22b386a85567b4ae4ec3a01492da45debb | |
| parent | 4286eeb53153a02b83bed4446488cf510111b3fd (diff) | |
| parent | 6d3b5b24fd4f82c1cbfbc4cade5246a0335f8dda (diff) | |
Merge pull request #7386 from owncloud/stable6-fixhostnamewithport
Fix case where port is missing
| -rwxr-xr-x | lib/private/request.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/request.php b/lib/private/request.php index 6717d8e68eb..f5b5aa0b818 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -58,7 +58,7 @@ class OC_Request { if (isset($_SERVER['HTTP_HOST'])) { $host = $_SERVER['HTTP_HOST']; } - if (isset($_SERVER['SERVER_NAME'])) { + else if (isset($_SERVER['SERVER_NAME'])) { $host = $_SERVER['SERVER_NAME']; } } |