Always return language prop even if no other prefs are saved

release-0.6
thomascube 16 years ago
parent b62b5a0395
commit 155329b71c

@ -78,10 +78,12 @@ class rcube_user
*/
function get_prefs()
{
$prefs = array('language' => $this->language);
if ($this->ID && $this->data['preferences'])
return array('language' => $this->language) + unserialize($this->data['preferences']);
else
return array();
$prefs += (array)unserialize($this->data['preferences']);
return $prefs;
}

Loading…
Cancel
Save