diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-05-29 18:54:06 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-05-29 18:54:06 +0200 |
| commit | a9f5e572dde4f986a498d2fbe92a38a1b22f9595 (patch) | |
| tree | 80b5bfc9836ae92cc4929a4d72ae0b2730e568bc /inc/poche/Tools.class.php | |
| parent | 96834a47b09985e1c82b82857fc108f20e8b8f2b (diff) | |
| parent | 8038b38802769031e050c753fc0a388a2276629e (diff) | |
| download | wallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.tar.gz wallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.tar.zst wallabag-a9f5e572dde4f986a498d2fbe92a38a1b22f9595.zip | |
Merge pull request #712 from wallabag/dev1.7.0
1.7, call me "Premium version"
Diffstat (limited to 'inc/poche/Tools.class.php')
| -rwxr-xr-x | inc/poche/Tools.class.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 7f064020..8073a3fe 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
| @@ -60,6 +60,10 @@ class Tools | |||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | $host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])); | 62 | $host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])); |
| 63 | |||
| 64 | if (strpos($host, ':') !== false) { | ||
| 65 | $serverport = ''; | ||
| 66 | } | ||
| 63 | 67 | ||
| 64 | return 'http' . ($https ? 's' : '') . '://' | 68 | return 'http' . ($https ? 's' : '') . '://' |
| 65 | . $host . $serverport . $scriptname; | 69 | . $host . $serverport . $scriptname; |