From cca8e33942b45701de1a7ca9e83b995bf2889476 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 22 Aug 2014 12:57:41 +0000
Subject: [PATCH] Backport commit r47976, committed by Leithoff. Do not use
 Session to cache HierarchyDelimiter

---
 emailadmin/inc/class.emailadmin_imapbase.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emailadmin/inc/class.emailadmin_imapbase.inc.php b/emailadmin/inc/class.emailadmin_imapbase.inc.php
index b7c9ab419c..f18f88e4a9 100644
--- a/emailadmin/inc/class.emailadmin_imapbase.inc.php
+++ b/emailadmin/inc/class.emailadmin_imapbase.inc.php
@@ -973,7 +973,7 @@ class emailadmin_imapbase
 	function getHierarchyDelimiter($_useCache=true)
 	{
 		static $HierarchyDelimiter;
-		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter =& egw_cache::getSession('mail','HierarchyDelimiter');
+		if (is_null($HierarchyDelimiter)) $HierarchyDelimiter = egw_cache::getCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*24*5);
 		if ($_useCache===false) unset($HierarchyDelimiter[$this->icServer->ImapServerId]);
 		if (isset($HierarchyDelimiter[$this->icServer->ImapServerId])&&!empty($HierarchyDelimiter[$this->icServer->ImapServerId]))
 		{
@@ -988,6 +988,7 @@ class emailadmin_imapbase
 		{
 			$HierarchyDelimiter[$this->icServer->ImapServerId] = '/';
 		}
+		egw_cache::setCache(egw_cache::INSTANCE,'email','HierarchyDelimiter'.trim($GLOBALS['egw_info']['user']['account_id']),$HierarchyDelimiter, $expiration=60*60*24*5);
 		return $HierarchyDelimiter[$this->icServer->ImapServerId];
 	}