Merge branch 'master' of github.com:roundcube/roundcubemail

pull/52/head
Aleksander Machniak 12 years ago
commit 87ec1de655

@ -151,7 +151,7 @@ class rcube_imap extends rcube_storage
$attempt = 0; $attempt = 0;
do { 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, array_merge($this->options, array('host' => $host, 'user' => $user,
'attempt' => ++$attempt))); 'attempt' => ++$attempt)));

@ -78,7 +78,8 @@ class rcube_plugin_api
'identity_save' => 'identity_update', 'identity_save' => 'identity_update',
// to be removed after 0.8 // to be removed after 0.8
'imap_init' => 'storage_init', 'imap_init' => 'storage_init',
'mailboxes_list' => 'storage_folders', 'mailboxes_list' => 'storage_folders',
'imap_connect' => 'storage_connect',
); );
/** /**

Loading…
Cancel
Save