We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit c4a8a677 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

parents 2d55bc0e 0ed572ff
......@@ -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';
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment