From: Emily O'Leary <lotusecho@ThinkLotus>
Date: Mon, 25 Mar 2013 05:52:10 +0000 (-0400)
Subject: Putting in functionality so that sites with the "Sometimes" SSL setting allow for... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81a357ed5e77d20c000a1a10b0478332259cab74;p=quix0rs-gnu-social.git

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.)
---

diff --git a/lib/util.php b/lib/util.php
index bda78afe13..52de9ccef9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -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);