From: Jan Schneider <jan@horde.org>
Date: Wed, 6 Oct 2010 23:22:15 +0000 (+0200)
Subject: Fix charset conversion.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bc53faae081439833bb25937db42310e4bcdcf2d;p=horde.git

Fix charset conversion.
---

diff --git a/framework/Prefs/lib/Horde/Prefs/Identity.php b/framework/Prefs/lib/Horde/Prefs/Identity.php
index 507765ebf..fc3dc76b0 100644
--- a/framework/Prefs/lib/Horde/Prefs/Identity.php
+++ b/framework/Prefs/lib/Horde/Prefs/Identity.php
@@ -91,8 +91,10 @@ class Horde_Prefs_Identity
         $this->_prefs = $params['prefs'];
         $this->_user = $params['user'];
 
-        if (!($this->_identities = @unserialize($this->_prefs->getValue($this->_prefnames['identities'])))) {
+        if (!($this->_identities = unserialize($this->_prefs->getValue($this->_prefnames['identities'], false)))) {
             $this->_identities = $this->_prefs->getDefault($this->_prefnames['identities']);
+        } elseif (is_array($this->_identities)) {
+            $this->_identities = $this->_prefs->convertFromDriver($this->_identities);
         }
 
         $this->setDefault($this->_prefs->getValue($this->_prefnames['default_identity']));