From 9cfd8fcb628fc54fdc1ae80b53961b80fc01d7c1 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 13 Oct 2009 07:41:31 +0000
Subject: - performance: fix storing of imap_delimiter in session

git-svn-id: https://svn.roundcube.net/trunk@3037 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_imap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 533f94177..a358186cf 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -112,7 +112,7 @@ class rcube_imap
 
     $ICL_PORT = $port;
     $IMAP_USE_INTERNAL_DATE = false;
-    
+
     $attempt = 0;
     do {
       $data = rcmail::get_instance()->plugins->exec_hook('imap_connect', array('host' => $host, 'user' => $user, 'attempt' => ++$attempt));
@@ -144,13 +144,13 @@ class rcube_imap
     // get server properties
     if ($this->conn)
       {
-      if (!empty($this->conn->delimiter))
-        $this->delimiter = $this->conn->delimiter;
       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();
       }
 
     return $this->conn ? TRUE : FALSE;
-- 
cgit v1.2.3