summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2012-01-16 15:23:40 +0000
committerthomascube <thomas@roundcube.net>2012-01-16 15:23:40 +0000
commita2c495618a75e306678d9682042f4159bd43c2fa (patch)
tree1e48ac8bff66b11d7fa7e7e840ede6e6fa32cbaa
parentc321a955a7b0f6d6b13ffaebf040a6c7091037ae (diff)
Run imap_init plugin hook as deprecated hook; set $_SESSION['imap_host'] for backwards compat.
-rw-r--r--program/include/rcmail.php5
-rw-r--r--program/include/rcube_plugin_api.php1
2 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7c01edf6f..0bf9cf496 100644
--- a/program/include/rcmail.php
+++ b/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/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index c4b3d5734..9c3378e67 100644
--- a/program/include/rcube_plugin_api.php
+++ b/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',
);
/**