From 3c5489ba7547c88ba0f82b6ea0574d1a7185f416 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 21 May 2012 03:25:51 -0400
Subject: [PATCH] Add option imap_force_ns to make buggy servers support optional
---
program/include/rcube_imap.php | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 20428cc..f401f37 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2539,11 +2539,8 @@
return array();
}
- // #1486796: some server configurations doesn't
- // return folders in all namespaces, we'll try to detect that situation
- // and ask for these namespaces separately
- // @TODO: make this optional
- if ($root == '' && $name == '*') {
+ // #1486796: some server configurations doesn't return folders in all namespaces
+ if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
$this->list_folders_update($a_folders, ($list_extended ? 'ext-' : '') . 'subscribed');
}
@@ -2673,11 +2670,8 @@
return array();
}
- // #1486796: some server configurations doesn't
- // return folders in all namespaces, we'll try to detect that situation
- // and ask for these namespaces separately
- // @TODO: make this optional
- if ($root == '' && $name == '*') {
+ // #1486796: some server configurations doesn't return folders in all namespaces
+ if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
$this->list_folders_update($result);
}
--
Gitblit v1.9.1