From 7d6bd5670e8743e10c52b745142320a47d0f1cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 2 Apr 2015 11:36:10 +0200
Subject: [PATCH 1/2] Update README.md

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 38866f7af..bded71986 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)

From 6e22fc17d2df7f7c3636b9064c4016fefb88e7f9 Mon Sep 17 00:00:00 2001
From: Carsten Ringe <carsten@kopis.de>
Date: Tue, 9 Jun 2015 19:51:01 +0200
Subject: [PATCH 2/2] Use config option BASE_URL in getPocheUrl()

---
 inc/poche/Tools.class.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index d0b31d4f1..d3dddd3ba 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;
     }
 
     /**