mirror of
https://github.com/wallabag/wallabag.git
synced 2024-06-13 02:39:31 +00:00
Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev
This commit is contained in:
commit
a754e1c3f0
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue