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

This commit is contained in:
Evan Prodromou 2010-10-14 01:09:02 -04:00
parent ac63f8baae
commit 7436e5d13e
1 changed files with 2 additions and 2 deletions

View File

@ -362,7 +362,7 @@ class HTMLOutputter extends XMLOutputter
if (strpos($src, 'plugins/') === 0 || strpos($src, 'local/') === 0) { 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 { } else {
@ -467,7 +467,7 @@ class HTMLOutputter extends XMLOutputter
if(file_exists(Theme::file($src,$theme))){ if(file_exists(Theme::file($src,$theme))){
$src = Theme::path($src, $theme); $src = Theme::path($src, $theme);
}else{ }else{
$src = common_path($src); $src = common_path($src, StatusNet::isHTTPS());
} }
$src.= '?version=' . STATUSNET_VERSION; $src.= '?version=' . STATUSNET_VERSION;
} }