summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorFelix Eckhofer <felix@eckhofer.com>2014-03-26 20:45:33 +0100
committerFelix Eckhofer <felix@eckhofer.com>2014-03-26 20:45:33 +0100
commit30e6b980a6a4f528f79407203761823b7b2c5683 (patch)
tree5415344aca58b11125cfbc816f85d88fdd7caa3f /program/lib
parentef721fc430fbb19da13060105577bf7605606b81 (diff)
Remove usage of $RCMAIL global variable
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_utils.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 4a183bd79..c2009cee0 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -593,8 +593,6 @@ class rcube_utils
*/
public static function https_check($port=null, $use_https=true)
{
- global $RCMAIL;
-
if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
return true;
}
@@ -606,7 +604,7 @@ class rcube_utils
if ($port && $_SERVER['SERVER_PORT'] == $port) {
return true;
}
- if ($use_https && isset($RCMAIL) && $RCMAIL->config->get('use_https')) {
+ if ($use_https && rcube::get_instance()->config->get('use_https')) {
return true;
}