From: Evan Prodromou <evan@status.net>
Date: Thu, 14 Oct 2010 05:09:02 +0000 (-0400)
Subject: use HTTPS for scripts and stylesheets if the current page is HTTPS
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7436e5d13e6bc242a93e2f6dc561c59f88de60ee;p=quix0rs-gnu-social.git

use HTTPS for scripts and stylesheets if the current page is HTTPS
---

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 8d3e815d33..f01f1814f0 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -362,7 +362,7 @@ class HTMLOutputter extends XMLOutputter
 
                 if (strpos($src, 'plugins/') === 0 || strpos($src, 'local/') === 0) {
 
-                    $src = common_path($src) . '?version=' . STATUSNET_VERSION;
+                    $src = common_path($src, StatusNet::isHTTPS()) . '?version=' . STATUSNET_VERSION;
 
                 } else {
 
@@ -467,7 +467,7 @@ class HTMLOutputter extends XMLOutputter
                 if(file_exists(Theme::file($src,$theme))){
                    $src = Theme::path($src, $theme);
                 }else{
-                   $src = common_path($src);
+                    $src = common_path($src, StatusNet::isHTTPS());
                 }
                 $src.= '?version=' . STATUSNET_VERSION;
             }