mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-13 04:45:03 -05:00
Merge branch 'master' of git://github.com/DmitrySandalov/poche into DmitrySandalov-master
This commit is contained in:
commit
705f04937f
@ -8,4 +8,4 @@ To fix the bug quickly, we need some infos:
|
||||
* the link you want to poche and which causes problem
|
||||
|
||||
## You want to fix a bug or to add a feature
|
||||
Please fork poche and work with the dev branch. Do not work on master branch.
|
||||
Please fork poche and work with **the dev branch** only. Do not work on master branch.
|
||||
|
@ -53,12 +53,12 @@ class Tools
|
||||
|
||||
$scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
|
||||
|
||||
if (!isset($_SERVER["SERVER_NAME"])) {
|
||||
if (!isset($_SERVER["HTTP_HOST"])) {
|
||||
return $scriptname;
|
||||
}
|
||||
|
||||
return 'http' . ($https ? 's' : '') . '://'
|
||||
. $_SERVER["SERVER_NAME"] . $serverport . $scriptname;
|
||||
. $_SERVER["HTTP_HOST"] . $serverport . $scriptname;
|
||||
}
|
||||
|
||||
public static function redirect($url = '')
|
||||
|
Loading…
Reference in New Issue
Block a user