Run imap_init plugin hook as deprecated hook; set $_SESSION['imap_host'] for backwards compat.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 7c01edf6f..0bf9cf496 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -682,13 +682,12 @@ class rcmail
       $options['port']     = $_SESSION['storage_port'];
       $options['ssl']      = $_SESSION['storage_ssl'];
       $options['password'] = $this->decrypt($_SESSION['password']);
+      // set 'imap_host' for backwards compatibility
+      $_SESSION[$driver.'_host'] = &$_SESSION['storage_host'];
     }
 
     $options = $this->plugins->exec_hook("storage_init", $options);
 
-    // for backward compat. (deprecated, to be removed)
-    $options = $this->plugins->exec_hook("imap_init", $options);
-
     $this->storage->set_options($options);
     $this->set_storage_prop();
   }
diff --git a/roundcubemail/program/include/rcube_plugin_api.php b/roundcubemail/program/include/rcube_plugin_api.php
index c4b3d5734..9c3378e67 100644
--- a/roundcubemail/program/include/rcube_plugin_api.php
+++ b/roundcubemail/program/include/rcube_plugin_api.php
@@ -71,6 +71,7 @@ class rcube_plugin_api
     'delete_identity'   => 'identity_delete',
     'save_identity'     => 'identity_update',
     'identity_save'     => 'identity_update',
+    'imap_init'         => 'storage_init',
   );
 
   /**