From 565e32aca30247a6ecbdf7b2748647dcb5f0f718 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 19 Oct 2013 14:52:09 +0200 Subject: [PATCH] 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. --- lib/util.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 608938c4c0..f1f3437eb3 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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); -- 2.39.5