diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-21 17:53:58 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-21 17:53:58 +0200 |
| commit | 9a2de8411ecb66e3df2fae5e65f0251b7c25173f (patch) | |
| tree | b408046bf6312026017ef1ee9dd5d268d6ae641c /plugins | |
| parent | 799d72b8233897b7ca1bb1db81662ddd3e9912c5 (diff) | |
| parent | 3c5489ba7547c88ba0f82b6ea0574d1a7185f416 (diff) | |
Merge branch 'courier-fix'
Conflicts:
CHANGELOG
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/subscriptions_option/package.xml | 4 | ||||
| -rw-r--r-- | plugins/subscriptions_option/subscriptions_option.php | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/plugins/subscriptions_option/package.xml b/plugins/subscriptions_option/package.xml index 1ecabf711..79d44f8c2 100644 --- a/plugins/subscriptions_option/package.xml +++ b/plugins/subscriptions_option/package.xml @@ -23,9 +23,9 @@ <email>ziba@umich.edu</email> <active>yes</active> </developer> - <date>2012-03-05</date> + <date>2012-05-21</date> <version> - <release>1.2</release> + <release>1.3</release> <api>1.1</api> </version> <stability> diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php index 28f826263..8b27afbdc 100644 --- a/plugins/subscriptions_option/subscriptions_option.php +++ b/plugins/subscriptions_option/subscriptions_option.php @@ -74,12 +74,9 @@ class subscriptions_option extends rcube_plugin function mailboxes_list($args) { - $rcmail = rcmail::get_instance(); + $rcmail = rcmail::get_instance(); if (!$rcmail->config->get('use_subscriptions', true)) { - $storage = $rcmail->get_storage(); - if ($storage->check_connection()) { - $args['folders'] = $storage->conn->listMailboxes($args['root'], $args['name']); - } + $args['folders'] = $rcmail->get_storage()->list_folders_direct(); } return $args; } |