Commit 565e32ac authored by mmn's avatar mmn

Always generate local HTTPS links if ssl is 'always'

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.
parent 2a5ba1f7
......@@ -1241,7 +1241,9 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
$r = Router::get();
$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')) {
$url = common_path($path, $ssl, $addSession);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment