| | |
|---|
| | | if ($this->fieldmap['street'] && $this->fieldmap['locality']) { |
|---|
| | | $this->coltypes['address'] = array( |
|---|
| | | 'limit' => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']), |
|---|
| | | 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], $this->coltypes['locality']['subtypes']), |
|---|
| | | 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], (array)$this->coltypes['locality']['subtypes']), |
|---|
| | | 'childs' => array(), |
|---|
| | | ) + (array)$this->coltypes['address']; |
|---|
| | | |
|---|
| | |
|---|
| | | else if ($val == '') { |
|---|
| | | // Field supplied is empty, verify that it is not required. |
|---|
| | | if (!in_array($fld, $this->prop['required_fields'])) { |
|---|
| | | // It is not, safe to clear. |
|---|
| | | $deletedata[$fld] = $old_data[$fld]; |
|---|
| | | // ...It is not, safe to clear. |
|---|
| | | // #1488420: Workaround "ldap_mod_del(): Modify: Inappropriate matching in..." |
|---|
| | | // jpegPhoto attribute require an array() here. It looks to me that it works for other attribs too |
|---|
| | | $deletedata[$fld] = array(); |
|---|
| | | //$deletedata[$fld] = $old_data[$fld]; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | else { |
|---|
