summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorFelix Eckhofer <felix@eckhofer.com>2014-03-26 20:45:33 +0100
committerThomas Bruederli <thomas@roundcube.net>2014-04-25 18:39:05 +0200
commitd71a711ab06483e62b1a7343e296ef8639352689 (patch)
tree00638919ed7a81322d5008c82fea06009a087429 /program/lib
parentc3c4842c5f3525679a7f26ddf642532c820d0e33 (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 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;
}