eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When viewing a page in https, all links to non-actions (links to CSS, JS, etc) should be https. Fixes the mixed content warnings that browsers display. 

Fixes http://status.net/trac/ticket/1552
This commit is contained in:
Craig Andrews 2009-09-13 01:24:57 -04:00
parent 0a1d2635c1
commit 20997619b3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util.php
View File

@ -750,8 +750,18 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
return $url;
}
function common_path($relative, $ssl=false)
function common_path($relative, $ssl=null)
{
if($ssl==null) {
//ssl was not specifically requested
if( $_SERVER['HTTPS'] && $_SERVER['HTTPS']!="off" ) {
//currently in https, so stay in https
$ssl=true;
} else {
//not in https, so stay not in https
$ssl=false;
}
}
$pathpart = (common_config('site', 'path')) ? common_config('site', 'path')."/" : '';
if (($ssl && (common_config('site', 'ssl') === 'sometimes'))