Thomas Bruederli
2013-05-26 e1a3caf659c01374d7039ee4b3fc31099936f2ba
Also display contact properties with unknown subtypes
1 files modified
21 ■■■■ changed files
program/steps/addressbook/func.inc 21 ●●●● patch | view | raw | blame | history
program/steps/addressbook/func.inc
@@ -551,22 +551,13 @@
                    // iterate over possible subtypes and collect values with their subtype
                    if (is_array($colprop['subtypes'])) {
                        $values = $subtypes = array();
                        foreach ($colprop['subtypes'] as $i => $st) {
                            $newval = false;
                            if ($record[$field.':'.$st]) {
                                $subtypes[count($values)] = $st;
                                $newval = $record[$field.':'.$st];
                        foreach (rcube_addressbook::get_col_values($field, $record) as $st => $vals) {
                            foreach((array)$vals as $value) {
                                $i = count($values);
                                $subtypes[$i] = $st;
                                $values[$i] = $value;
                            }
                            else if ($i == 0 && $record[$field]) {
                                $subtypes[count($values)] = $st;
                                $newval = $record[$field];
                            }
                            if ($newval !== false) {
                                if (is_array($newval) && isset($newval[0]))
                                    $values = array_merge($values, $newval);
                                else
                                    $values[] = $newval;
                            }
                            // TODO: add $st to $select_subtype if missing ?
                        }
                    }
                    else {