summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-23 09:34:55 -0400
committerEvan Prodromou <evan@status.net>2009-09-23 09:34:55 -0400
commitbef4a8b6ba9e19f2ec629031444279ca76f17bcf (patch)
tree876170edd27b0b58f0170b2981348a76ad42832f
parent42ba05de5fa9413ce0f383cfdafa7288e291ab17 (diff)
Revert "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."
This reverts commit 20997619b353faa94591800fbfc02bc19a4cdce3. The commit doesn't take into account having different servers (theme server, avatar server) and being able to set HTTPS for some but not all.
-rw-r--r--lib/util.php12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/util.php b/lib/util.php
index 5b57b79b5..b831859e9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -750,18 +750,8 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
return $url;
}
-function common_path($relative, $ssl=null)
+function common_path($relative, $ssl=false)
{
- 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'))