From bc53faae081439833bb25937db42310e4bcdcf2d Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 7 Oct 2010 01:22:15 +0200 Subject: [PATCH] Fix charset conversion. --- framework/Prefs/lib/Horde/Prefs/Identity.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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'])); -- 2.11.0