From a2c495618a75e306678d9682042f4159bd43c2fa Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 16 Jan 2012 10:23:40 -0500
Subject: [PATCH] Run imap_init plugin hook as deprecated hook; set $_SESSION['imap_host'] for backwards compat.

---
 program/include/rcmail.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7c01edf..0bf9cf4 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -682,12 +682,11 @@
       $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();

--
Gitblit v1.9.1