From d71a711ab06483e62b1a7343e296ef8639352689 Mon Sep 17 00:00:00 2001 From: Felix Eckhofer Date: Wed, 26 Mar 2014 20:45:33 +0100 Subject: Remove usage of $RCMAIL global variable --- program/lib/Roundcube/rcube_utils.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index 46d53ac91..ae3e3a414 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; } @@ -604,7 +602,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; } -- cgit v1.2.3