forked from GNUsocial/gnu-social
Putting in functionality so that sites with the "Sometimes" SSL setting allow for users with plugins such as HTTPSEVERYWHERE who wish to use HTTPS to do so without having errors pop up. Specifically this references this issue: http://status.net/open-source/issues/3855#comment-48988.
(Port detection test removed by MMN-o. Also switched order on the test for isHTTPS/SensitiveAction.)
This commit is contained in:
parent
99312c8cc2
commit
81a357ed5e
@ -1236,7 +1236,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
|
||||
$r = Router::get();
|
||||
$path = $r->build($action, $args, $params, $fragment);
|
||||
|
||||
$ssl = common_is_sensitive($action);
|
||||
$ssl = StatusNet::isHTTPS() || common_is_sensitive($action);
|
||||
|
||||
if (common_config('site','fancy')) {
|
||||
$url = common_path($path, $ssl, $addSession);
|
||||
|
Loading…
Reference in New Issue
Block a user