mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-05-16 08:12:39 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Thomas Citharel 2015-06-29 15:29:18 +02:00
parent 9786dbf165 6e22fc17d2
commit a754e1c3f0
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

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

10
inc/poche/Tools.class.php
View file

@ -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;
}
/**