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/rcube_plugin_api.php | 1 +
program/include/rcmail.php | 5 ++---
2 files changed, 3 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();
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index c4b3d57..9c3378e 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -71,6 +71,7 @@
'delete_identity' => 'identity_delete',
'save_identity' => 'identity_update',
'identity_save' => 'identity_update',
+ 'imap_init' => 'storage_init',
);
/**
--
Gitblit v1.9.1