- Framework refactoring (I hope it's the last one):

  rcube,rcmail,rcube_ui -> rcube,rcmail,rcube_utils
  renamed main.inc into rcube_bc.inc


git-svn-id: https://svn.roundcube.net/trunk@6091 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index e14dcb85a..5cc8571c9 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -369,11 +369,13 @@ class rcube_config
             if (isset($this->prop['mail_domain'][$host]))
                 $domain = $this->prop['mail_domain'][$host];
         }
-        else if (!empty($this->prop['mail_domain']))
-            $domain = rcmail::parse_host($this->prop['mail_domain']);
+        else if (!empty($this->prop['mail_domain'])) {
+            $domain = rcube_utils::parse_host($this->prop['mail_domain']);
+        }
 
-        if ($encode)
-            $domain = rcube_idn_to_ascii($domain);
+        if ($encode) {
+            $domain = rcube_utils::idn_to_ascii($domain);
+        }
 
         return $domain;
     }