Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
c4a8a6776e
@ -56,6 +56,8 @@ class AllrssAction extends Rss10Action
|
||||
* @param array $args Web and URL arguments
|
||||
*
|
||||
* @return boolean false if user doesn't exist
|
||||
*
|
||||
*/
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
@ -377,7 +377,11 @@ class StatusNet
|
||||
static function isHTTPS()
|
||||
{
|
||||
// There are some exceptions to this; add them here!
|
||||
return !empty($_SERVER['HTTPS']);
|
||||
if(empty($_SERVER['HTTPS'])) {
|
||||
return false;
|
||||
} else {
|
||||
return $_SERVER['HTTPS'] !== 'off';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user