summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-14 01:09:02 -0400
committerEvan Prodromou <evan@status.net>2010-10-14 01:09:02 -0400
commit7436e5d13e6bc242a93e2f6dc561c59f88de60ee (patch)
tree3d79d0d8865d1ec91d37a3050ef56d5b3948621f /lib
parentac63f8baae281bff47f325005b6621dc61a1a71b (diff)
use HTTPS for scripts and stylesheets if the current page is HTTPS
Diffstat (limited to 'lib')
-rw-r--r--lib/htmloutputter.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 8d3e815d3..f01f1814f 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;
}