Simplify shutdown, now that it is always triggered

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

1 files changed, 4 insertions, 9 deletions

diff --git a/plugins/kolab_core/rcube_kolab.php b/plugins/kolab_core/rcube_kolab.php
index 94511e55d..b3e9f9fe5 100644
--- a/plugins/kolab_core/rcube_kolab.php
+++ b/plugins/kolab_core/rcube_kolab.php
@@ -48,6 +48,8 @@ class rcube_kolab
             );
             Auth::setCredential('password', $pwd);
         }
+        
+        NLS::setCharset('UTF-8');
     }
     
     
@@ -95,15 +97,8 @@ class rcube_kolab
      */
     public static function shutdown()
     {
-        if (isset($_SESSION['__auth'])) {
-            // unset auth data from session. no need to store it persistantly
+        // unset auth data from session. no need to store it persistantly
+        if (isset($_SESSION['__auth']))
             unset($_SESSION['__auth']);
-            
-            // FIXME: remove strange numeric entries
-            foreach ($_SESSION as $key => $val) {
-                if (!$val && is_numeric($key))
-                    unset($_SESSION[$key]);
-            }
-        }
     }
 }