moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/DmitrySandalov/poche into DmitrySandalov-master

This commit is contained in:
Nicolas Lœuillet 2013-11-13 14:52:28 +01:00
parent 5862c872c6 45e9e0f565
commit 705f04937f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -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.

4
inc/poche/Tools.class.php
View File

@ -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 = '')