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

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

Browse Source
This commit is contained in:
Evan Prodromou 2010-11-11 15:32:24 -05:00
commit c4a8a6776e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/allrss.php
View File

@ -56,6 +56,8 @@ class AllrssAction extends Rss10Action
* @param array $args Web and URL arguments * @param array $args Web and URL arguments
* *
* @return boolean false if user doesn't exist * @return boolean false if user doesn't exist
*
*/
function prepare($args) function prepare($args)
{ {
parent::prepare($args); parent::prepare($args);

6
lib/statusnet.php
View File

@ -377,7 +377,11 @@ class StatusNet
static function isHTTPS() static function isHTTPS()
{ {
// There are some exceptions to this; add them here! // There are some exceptions to this; add them here!
return !empty($_SERVER['HTTPS']); if(empty($_SERVER['HTTPS'])) {
return false;
} else {
return $_SERVER['HTTPS'] !== 'off';
}
} }
} }