From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Wed, 13 Nov 2013 14:23:52 +0000 (+0100)
Subject: Merge branch 'DmitrySandalov-master' into dev
X-Git-Tag: 1.2.0~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=760d44d1943ae1d016292e5cbbe30f3ed4813b50;hp=f2d3ee98a6a3137f8c3edd62294d34a8ff4700b6;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'DmitrySandalov-master' into dev
---

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:
 * 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.
\ No newline at end of file
+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
 
         $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 = '')