diff options
author | Sarven Capadisli <csarven@status.net> | 2010-02-13 20:28:39 +0100 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-02-13 20:28:39 +0100 |
commit | 9465a4d5c6b77bd77e78bc277a817e2b5724ec76 (patch) | |
tree | 8533ad32339160d5ba3cf27209f78740ffa977cd /classes/Avatar.php | |
parent | 171bf3093a4cf3f3ff0b4d255392ffd5375e4c36 (diff) | |
parent | 269b4711eb1600597af314f2fdca00102ff5566a (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Avatar.php')
-rw-r--r-- | classes/Avatar.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php index 91bde0f04..dbe2cd813 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -82,9 +82,20 @@ class Avatar extends Memcached_DataObject $server = common_config('site', 'server'); } - // XXX: protocol + $ssl = common_config('avatar', 'ssl'); + + if (is_null($ssl)) { // null -> guess + if (common_config('site', 'ssl') == 'always' && + !common_config('avatar', 'server')) { + $ssl = true; + } else { + $ssl = false; + } + } + + $protocol = ($ssl) ? 'https' : 'http'; - return 'http://'.$server.$path.$filename; + return $protocol.'://'.$server.$path.$filename; } function displayUrl() |