Putting in functionality so that sites with the "Sometimes" SSL setting allow for...

(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 bda78afe13f9de41a21287b317a1b87393cb8795..52de9ccef98c423931839018f70d7b8050e07c95 100644 (file)
--- 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);