- small code improvement in rcube_imap::mod_mailbox()

git-svn-id: https://svn.roundcube.net/trunk@3204 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 5 deletions

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 2408fa2ee..8d200363b 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2893,11 +2893,13 @@ class rcube_imap
     if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
       return $mbox_name;
 
-    if (!empty($this->root_dir) && $mode=='in') 
-      $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
-    else if (strlen($this->root_dir) && $mode=='out') 
-      $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
-
+    if (!empty($this->root_dir)) {
+      if ($mode=='in')
+        $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
+      else if (!empty($mbox_name)) // $mode=='out'
+        $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
+      }
+    
     return $mbox_name;
     }