- Merge devel-framework branch, resolved conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 854505d79..0923e3be0 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -52,7 +52,7 @@ class rcube_smtp
    */
   public function connect($host=null, $port=null, $user=null, $pass=null)
   {
-    $RCMAIL = rcmail::get_instance();
+    $RCMAIL = rcube::get_instance();
 
     // disconnect/destroy $this->conn
     $this->disconnect();
@@ -74,7 +74,7 @@ class rcube_smtp
       'smtp_auth_callbacks' => array(),
     ));
 
-    $smtp_host = rcube_parse_host($CONFIG['smtp_server']);
+    $smtp_host = rcmail::parse_host($CONFIG['smtp_server']);
     // when called from Installer it's possible to have empty $smtp_host here
     if (!$smtp_host) $smtp_host = 'localhost';
     $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
@@ -338,7 +338,7 @@ class rcube_smtp
    */
   public function debug_handler(&$smtp, $message)
   {
-    write_log('smtp', preg_replace('/\r\n$/', '', $message));
+    rcmail::write_log('smtp', preg_replace('/\r\n$/', '', $message));
   }