diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-12-13 15:15:53 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-12-13 15:15:53 +0100 |
| commit | 87ec1de655af6cdd0a0bbf14e05dce6a3f792f85 (patch) | |
| tree | 98a08c0f6e9ef44ede28bf06e26da54468cfa645 | |
| parent | a9bb50d8045e5a119ca5f66ec03753ca80aa4d4a (diff) | |
| parent | 5aed9a9a379e8324793fe107255f3467aa06ef31 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | program/lib/Roundcube/rcube_imap.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_plugin_api.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index ab90fa23f..ea3743d02 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -151,7 +151,7 @@ class rcube_imap extends rcube_storage $attempt = 0; do { - $data = rcube::get_instance()->plugins->exec_hook('imap_connect', + $data = rcube::get_instance()->plugins->exec_hook('storage_connect', array_merge($this->options, array('host' => $host, 'user' => $user, 'attempt' => ++$attempt))); diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index 51cf5d246..47508a2ef 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -78,7 +78,8 @@ class rcube_plugin_api 'identity_save' => 'identity_update', // to be removed after 0.8 'imap_init' => 'storage_init', - 'mailboxes_list' => 'storage_folders', + 'mailboxes_list' => 'storage_folders', + 'imap_connect' => 'storage_connect', ); /** |