Merge branch 'courier-fix'

Aleksander Machniak

2012-05-21 9a2de8411ecb66e3df2fae5e65f0251b7c25173f

 plugins/subscriptions_option/subscriptions_option.php

@@ -74,12 +74,9 @@

    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;
    }