GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

When called in offline queue, File::url was HTTP

Browse Source 
Despite having the site configured "always" for HTTPS, File generated
thumbnails and such with HTTP urls.
This commit is contained in:
Mikael Nordfeldth 2015-01-12 18:56:19 +01:00
parent 65c540478e
commit cbb7ec07a5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/File.php
View File

@ -303,7 +303,7 @@ class File extends Managed_DataObject
} }
if (StatusNet::isHTTPS()) { if (StatusNet::useHTTPS()) {
$sslserver = common_config('attachments', 'sslserver'); $sslserver = common_config('attachments', 'sslserver');

13
lib/statusnet.php
View File

@ -425,9 +425,18 @@ class StatusNet
// There are some exceptions to this; add them here! // There are some exceptions to this; add them here!
if (empty($_SERVER['HTTPS'])) { if (empty($_SERVER['HTTPS'])) {
return false; return false;
} else {
return $_SERVER['HTTPS'] !== 'off';
} }
// If it is _not_ "off", it is on, so "true".
return strtolower($_SERVER['HTTPS']) !== 'off';
}
/**
* Can we use HTTPS? Then do! Only return false if it's not configured ("never").
*/
static function useHTTPS()
{
return self::isHTTPS() || common_config('site', 'ssl') != 'never';
} }
} }