aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-11-13 14:52:28 +0100
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-11-13 14:52:28 +0100
commit705f04937fb5d5db59fe7b9643402f6ffbf07ff9 (patch)
tree3040d9cf3898c67ce36156342139019a8af0e5c8 /inc
parent5862c872c6c63c8a0a8d33e751e3ee5146b2728e (diff)
parent45e9e0f5653993d5f463209691953e7a41527267 (diff)
downloadwallabag-705f04937fb5d5db59fe7b9643402f6ffbf07ff9.tar.gz
wallabag-705f04937fb5d5db59fe7b9643402f6ffbf07ff9.tar.zst
wallabag-705f04937fb5d5db59fe7b9643402f6ffbf07ff9.zip
Merge branch 'master' of git://github.com/DmitrySandalov/poche into DmitrySandalov-master
Diffstat (limited to 'inc')
-rw-r--r--inc/poche/Tools.class.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 1d092823..030d75ba 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 = '')