From: Joshua Judson Rosen <rozzin@geekspace.com>
Date: Sat, 29 Nov 2014 05:30:11 +0000 (-0500)
Subject: common_path(): use HTTPS if current URL is HTTPS
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=69fec16de2c9168dc77f2808725c3ca37fa545a1;p=quix0rs-gnu-social.git

common_path(): use HTTPS if current URL is HTTPS

Bring common_path() back into harmony with common_local_url(),
which started doing this 2013-03-25.

Shouldn't need to spread "StatusNet::isHTTPS()" logic all over
wherever common_path() is called; just DTRT automatically instead.
---

diff --git a/lib/util.php b/lib/util.php
index 08a0cdea2f..e18e1991ff 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1261,6 +1261,7 @@ function common_path($relative, $ssl=false, $addSession=true)
     $pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
 
     if (($ssl && (common_config('site', 'ssl') === 'sometimes'))
+        || StatusNet::isHTTPS()
         || common_config('site', 'ssl') === 'always') {
         $proto = 'https';
         if (is_string(common_config('site', 'sslserver')) &&