From 0e41e83520490b97023b361fb59cbd8f4d0d4eda Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 15 Nov 2012 22:13:11 +0000 Subject: [PATCH] one server-config missed in r36329: arrays in $GLOBALS[egw_info][server] are now automatically serialized and unserialized --- addressbook/inc/class.addressbook_bo.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index 6172b8eaf5..3d2dab000e 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -283,7 +283,8 @@ class addressbook_bo extends addressbook_so 'adr_two_countryname' => lang('country').' ('.lang('business').')', ); //_debug_array($this->contact_fields); - $this->own_account_acl = unserialize($GLOBALS['egw_info']['server']['own_account_acl']); + $this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl']; + if (!is_array($this->own_account_acl)) $this->own_account_acl = unserialize($this->own_account_acl); // we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl)) {