From 498969fbf9e86f51f62808f3c97528a9f5884629 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 15 Mar 2010 05:52:04 +0100
Subject: [PATCH] Use getName().

---
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index 0d6112f0b..e7e7a70a1 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -500,11 +500,7 @@ class Horde_Kolab_Storage_Folder
     {
         if (!isset($this->_subpath) || isset($name)) {
             if (!isset($name)) {
-                if (!isset($this->name) && isset($this->new_name)) {
-                    $name = $this->new_name;
-                } else {
-                    $name = $this->name;
-                }
+                $name = $this->getName();
             }
 
             if (!preg_match(";(shared\.|INBOX[/]?|user/([^/]+)[/]?)([^@]*)(@.*)?;", $name, $matches)) {
-- 
2.11.0