[Svn] r3355 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Fri Mar 12 11:12:23 CET 2010


Author: alec
Date: 2010-03-12 04:12:22 -0600 (Fri, 12 Mar 2010)
New Revision: 3355

Modified:
   trunk/roundcubemail/program/include/rcube_imap.php
Log:
-remove root_ns setting as useless, should fix #1486222


Modified: trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap.php	2010-03-12 08:13:59 UTC (rev 3354)
+++ trunk/roundcubemail/program/include/rcube_imap.php	2010-03-12 10:12:22 UTC (rev 3355)
@@ -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)) {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list