From 3c5489ba7547c88ba0f82b6ea0574d1a7185f416 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 21 May 2012 09:25:51 +0200
Subject: Add option imap_force_ns to make buggy servers support optional

---
 plugins/subscriptions_option/package.xml              | 4 ++--
 plugins/subscriptions_option/subscriptions_option.php | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'plugins/subscriptions_option')

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;
     }
-- 
cgit v1.2.3