From cf0ae1aac7876a383d4f2c48c28905923379a4b8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 28 Nov 2014 07:10:16 -0500 Subject: [PATCH] Fix regression where some (most) of the fields were missing in contact form --- plugins/kolab_addressbook/kolab_addressbook.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php index f2a896d8..22c40a5d 100644 --- a/plugins/kolab_addressbook/kolab_addressbook.php +++ b/plugins/kolab_addressbook/kolab_addressbook.php @@ -466,8 +466,8 @@ class kolab_addressbook extends rcube_plugin $p['form']['personal']['content']['pkcs7publickey'] = array('size' => 70); // re-order fields according to the coltypes list - $p['form']['contact']['content'] = $this->_sort_form_fields($p['form']['contact']['content']); - $p['form']['personal']['content'] = $this->_sort_form_fields($p['form']['personal']['content']); + $p['form']['contact']['content'] = $this->_sort_form_fields($p['form']['contact']['content'], $GLOBALS['CONTACTS']); + $p['form']['personal']['content'] = $this->_sort_form_fields($p['form']['personal']['content'], $GLOBALS['CONTACTS']); /* define a separate section 'settings' $p['form']['settings'] = array( @@ -485,12 +485,11 @@ class kolab_addressbook extends rcube_plugin } - private function _sort_form_fields($contents) + private function _sort_form_fields($contents, $source) { - $block = array(); - $contacts = reset($this->sources); + $block = array(); - foreach (array_keys($contacts->coltypes) as $col) { + foreach (array_keys($source->coltypes) as $col) { if (isset($contents[$col])) $block[$col] = $contents[$col]; }