summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-23 08:09:44 +0000
committeralecpl <alec@alec.pl>2012-01-23 08:09:44 +0000
commitb3ad480bbc3d0796c18ffd0573107e9142adbd71 (patch)
treef937cc13355220bdd3d23acba07f26eeb4aa7d39 /program
parent43d98b244c6ebd98ac28492b378c5e0e794862e2 (diff)
- Fix hook name mailboxes_list renamed to reserved name, use storage_folders and add an alias to deprecated hooks list
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_imap.php4
-rw-r--r--program/include/rcube_plugin_api.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 234e8d884..56b5e59fe 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2508,7 +2508,7 @@ class rcube_imap extends rcube_storage
$a_defaults = $a_out = array();
// Give plugins a chance to provide a list of folders
- $data = rcmail::get_instance()->plugins->exec_hook('folders_list',
+ $data = rcmail::get_instance()->plugins->exec_hook('storage_folders',
array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LSUB'));
if (isset($data['folders'])) {
@@ -2594,7 +2594,7 @@ class rcube_imap extends rcube_storage
}
// Give plugins a chance to provide a list of folders
- $data = rcmail::get_instance()->plugins->exec_hook('folders_list',
+ $data = rcmail::get_instance()->plugins->exec_hook('storage_folders',
array('root' => $root, 'name' => $name, 'filter' => $filter, 'mode' => 'LIST'));
if (isset($data['folders'])) {
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index e182ace95..fbf3584e3 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -74,7 +74,9 @@ class rcube_plugin_api
'delete_identity' => 'identity_delete',
'save_identity' => 'identity_update',
'identity_save' => 'identity_update',
+ // to be removed after 0.8
'imap_init' => 'storage_init',
+ 'mailboxes_list' => 'storage_folders',
);
/**