Remove usage of $RCMAIL global variable

10 years ago · d71a711ab0
parent c3c4842c5f
commit d71a711ab0
1 changed files with 1 additions and 3 deletions
--- 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;
        }