Changeset 5963 in subversion

Timestamp:

Mar 5, 2012 9:21:14 AM (15 months ago)

Author:

alec

Message:

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

File:

• trunk/plugins/subscriptions_option/subscriptions_option.php (modified) (2 diffs)

trunk/plugins/subscriptions_option/subscriptions_option.php

@@ -26 +26 @@
 {
     public $task = 'mail|settings';
-    
+
     function init()
     {
@@ -75 +75 @@
     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;