diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-06-29 15:29:18 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-06-29 15:29:18 +0200 |
commit | a754e1c3f07883bbdb1ed8abddecfc3c833de785 (patch) | |
tree | ffee0c9620bde6c50679ca6fe7bcd339871b5327 /inc/poche | |
parent | 9786dbf165737a696628fccc4d7998d4af677240 (diff) | |
parent | 6e22fc17d2df7f7c3636b9064c4016fefb88e7f9 (diff) | |
download | wallabag-a754e1c3f07883bbdb1ed8abddecfc3c833de785.tar.gz wallabag-a754e1c3f07883bbdb1ed8abddecfc3c833de785.tar.zst wallabag-a754e1c3f07883bbdb1ed8abddecfc3c833de785.zip |
Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Tools.class.php | 10 |
1 files changed, 8 insertions, 2 deletions
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 | |||
72 | $serverport = ''; | 72 | $serverport = ''; |
73 | } | 73 | } |
74 | 74 | ||
75 | return 'http' . ($https ? 's' : '') . '://' | 75 | // check if BASE_URL is configured |
76 | . $host . $serverport . $scriptname; | 76 | if(BASE_URL != null && BASE_URL != '') { |
77 | $baseUrl = BASE_URL; | ||
78 | } else { | ||
79 | $baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport; | ||
80 | } | ||
81 | |||
82 | return $baseUrl . $scriptname; | ||
77 | } | 83 | } |
78 | 84 | ||
79 | /** | 85 | /** |