From 1a864ca90261f8f934f51375daae00e800d98b7c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Wed, 21 Jan 2015 13:26:19 -0700
Subject: [PATCH] [mms] Fix rebuilding the folder tree translations when the
 language is changed in a session (Bug #13821).

---
 imp/docs/CHANGES        | 2 ++
 imp/lib/Application.php | 9 ++++++++-
 imp/package.xml         | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index a9b7cc480b4..c81f2aaa485 100644
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.7-git
 ----------
 
+[mms] Fix rebuilding the folder tree translations when the language is changed
+      in a session (Bug #13821).
 
 
 ------
diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index a6bcd11432d..c7fedb67650 100644
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -472,7 +472,14 @@ public function topbarCreate(Horde_Tree_Renderer_Base $tree,
      */
     public function changeLanguage()
     {
-        $GLOBALS['injector']->getInstance('IMP_Ftree')->init();
+        global $injector;
+
+        $injector->getInstance('IMP_Mailbox_SessionCache')->expire(array(
+            IMP_Mailbox_SessionCache::CACHE_DISPLAY,
+            IMP_Mailbox_SessionCache::CACHE_LABEL
+        ));
+
+        $injector->getInstance('IMP_Ftree')->init();
     }
 
     /* NoSQL methods. */
diff --git a/imp/package.xml b/imp/package.xml
index 8823763cf48..c503c1c9530 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [mms] Fix rebuilding the folder tree translations when the language is changed in a session (Bug #13821).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3814,7 +3814,7 @@
    <date>2015-01-20</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [mms] Fix rebuilding the folder tree translations when the language is changed in a session (Bug #13821).
    </notes>
   </release>
  </changelog>