- Fix new storage classes usage and connection checking (#1488380)

git-svn-id: https://svn.roundcube.net/trunk@5963 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 3 deletions

diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index 815f86bf0..28f826263 100644
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -25,7 +25,7 @@
 class subscriptions_option extends rcube_plugin
 {
     public $task = 'mail|settings';
-    
+
     function init()
     {
         $this->add_texts('localization/', false);
@@ -74,9 +74,12 @@ 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)) {
-            $args['folders'] = $rcmail->storage->conn->listMailboxes($args['root'], $args['name']);
+            $storage = $rcmail->get_storage();
+            if ($storage->check_connection()) {
+                $args['folders'] = $storage->conn->listMailboxes($args['root'], $args['name']);
+            }
         }
         return $args;
     }