Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev

2 files changed, 15 insertions, 2 deletions

diff --git a/README.md b/README.md
index 4e8379a7..ea80cec4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
 # what is wallabag ?
+
+## About development
+We are working on a technical rework, using Symfony 2. You can contribute to [this version here](https://github.com/wallabag/wallabag/tree/v2).
+
+wallabag 1.x is still maintained but we won't develop new features. 
+
+## Description
 wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
 
 More informations on our website: [wallabag.org](http://wallabag.org)
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index f3d1013f..15050aed 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -72,8 +72,14 @@ final class Tools
             $serverport = '';
         }
 
-        return 'http' . ($https ? 's' : '') . '://'
-            . $host . $serverport . $scriptname;
+        // check if BASE_URL is configured
+        if(BASE_URL != null && BASE_URL != '') {
+                $baseUrl = BASE_URL;
+        } else {
+                $baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport;
+        }
+
+        return $baseUrl . $scriptname;
     }
 
     /**