common_path(): use HTTPS if current URL is HTTPS

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 08a0cdea2fac9f736e164ac0e01e0a3f1bccd2c9..e18e1991ff5f3c2df0c470a6b3d79866fbc78a2a 100644 (file)
--- 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')) &&