oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code 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
commit a754e1c3f0
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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