eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Always generate local HTTPS links if ssl is 'always'

Browse Source 
The isHTTPS call won't work in cli mode, so install_cli.php should
solve it some other way for initial profile url and User uri.
This commit is contained in:
Mikael Nordfeldth 2013-10-19 14:52:09 +02:00
parent 2a5ba1f74b
commit 565e32aca3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util.php
View File

@ -1241,7 +1241,9 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
$r = Router::get(); $r = Router::get();
$path = $r->build($action, $args, $params, $fragment); $path = $r->build($action, $args, $params, $fragment);
$ssl = StatusNet::isHTTPS() || common_is_sensitive($action); $ssl = common_config('site', 'ssl') === 'always'
|| StatusNet::isHTTPS()
|| common_is_sensitive($action);
if (common_config('site','fancy')) { if (common_config('site','fancy')) {
$url = common_path($path, $ssl, $addSession); $url = common_path($path, $ssl, $addSession);