diff options
| -rw-r--r-- | actions/allrss.php | 2 | ||||
| -rw-r--r-- | lib/statusnet.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/actions/allrss.php b/actions/allrss.php index d398c8a6a..573bb4eb2 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -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); diff --git a/lib/statusnet.php b/lib/statusnet.php index 33bf32b10..85b46bbb3 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -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'; + } } } |