diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-04-11 17:22:04 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-04-11 17:22:04 +0200 |
| commit | 4a74d9857cdb6116ce24df01b45176b92ad592c0 (patch) | |
| tree | f8347803fe40f8b27218cbad8ed688c7dbf3a46e /inc/poche/Tools.class.php | |
| parent | 0d67b00d5d3b7ce1b76b639dcc65c415a5f13439 (diff) | |
| parent | 7256e9e139eb07cdae1fbe3009454e6c7d9a8677 (diff) | |
| download | wallabag-4a74d9857cdb6116ce24df01b45176b92ad592c0.tar.gz wallabag-4a74d9857cdb6116ce24df01b45176b92ad592c0.tar.zst wallabag-4a74d9857cdb6116ce24df01b45176b92ad592c0.zip | |
Merge pull request #634 from wallabag/dev1.6.1b
1.6.1
Diffstat (limited to 'inc/poche/Tools.class.php')
| -rwxr-xr-x | inc/poche/Tools.class.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index a130e94b..7f064020 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
| @@ -59,8 +59,10 @@ class Tools | |||
| 59 | return $scriptname; | 59 | return $scriptname; |
| 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'])); | ||
| 63 | |||
| 62 | return 'http' . ($https ? 's' : '') . '://' | 64 | return 'http' . ($https ? 's' : '') . '://' |
| 63 | . $_SERVER["HTTP_HOST"] . $serverport . $scriptname; | 65 | . $host . $serverport . $scriptname; |
| 64 | } | 66 | } |
| 65 | 67 | ||
| 66 | public static function redirect($url = '') | 68 | public static function redirect($url = '') |