From 5027c326e9bf2c4c6ad8ab2aed3673ae83bd2b2c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 12 Mar 2010 05:12:22 -0500
Subject: [PATCH] -remove root_ns setting as useless, should fix #1486222
---
program/include/rcube_imap.php | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 66e6fa7..cb82996 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -43,7 +43,6 @@
{
var $db;
var $conn;
- var $root_ns = '';
var $root_dir = '';
var $mailbox = 'INBOX';
var $list_page = 1;
@@ -145,10 +144,7 @@
if ($this->conn)
{
if (!empty($this->conn->rootdir))
- {
$this->set_rootdir($this->conn->rootdir);
- $this->root_ns = preg_replace('/[.\/]$/', '', $this->conn->rootdir);
- }
if (empty($this->delimiter))
$this->get_hierarchy_delimiter();
}
@@ -2925,7 +2921,7 @@
*/
function mod_mailbox($mbox_name, $mode='in')
{
- if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
+ if ($mbox_name == 'INBOX')
return $mbox_name;
if (!empty($this->root_dir)) {
--
Gitblit v1.9.1