diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-11-13 15:23:52 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-11-13 15:23:52 +0100 |
| commit | 760d44d1943ae1d016292e5cbbe30f3ed4813b50 (patch) | |
| tree | 37e80402cebfd492421f34dc16eccf7b14ddfb46 | |
| parent | f2d3ee98a6a3137f8c3edd62294d34a8ff4700b6 (diff) | |
| parent | 705f04937fb5d5db59fe7b9643402f6ffbf07ff9 (diff) | |
| download | wallabag-760d44d1943ae1d016292e5cbbe30f3ed4813b50.tar.gz wallabag-760d44d1943ae1d016292e5cbbe30f3ed4813b50.tar.zst wallabag-760d44d1943ae1d016292e5cbbe30f3ed4813b50.zip | |
Merge branch 'DmitrySandalov-master' into dev
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | inc/poche/Tools.class.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85132e65..c89411f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
| @@ -8,4 +8,4 @@ To fix the bug quickly, we need some infos: | |||
| 8 | * the link you want to poche and which causes problem | 8 | * the link you want to poche and which causes problem |
| 9 | 9 | ||
| 10 | ## You want to fix a bug or to add a feature | 10 | ## You want to fix a bug or to add a feature |
| 11 | Please fork poche and work with the dev branch. Do not work on master branch. \ No newline at end of file | 11 | Please fork poche and work with **the dev branch** only. Do not work on master branch. |
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 7a872e7d..750553f1 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php | |||
| @@ -53,12 +53,12 @@ class Tools | |||
| 53 | 53 | ||
| 54 | $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); | 54 | $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); |
| 55 | 55 | ||
| 56 | if (!isset($_SERVER["SERVER_NAME"])) { | 56 | if (!isset($_SERVER["HTTP_HOST"])) { |
| 57 | return $scriptname; | 57 | return $scriptname; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | return 'http' . ($https ? 's' : '') . '://' | 60 | return 'http' . ($https ? 's' : '') . '://' |
| 61 | . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; | 61 | . $_SERVER["HTTP_HOST"] . $serverport . $scriptname; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | public static function redirect($url = '') | 64 | public static function redirect($url = '') |