summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-04 12:37:51 +0000
committeralecpl <alec@alec.pl>2012-01-04 12:37:51 +0000
commit896b2204e85aafb7eece9e42a0fb4e3bf5a8551b (patch)
treeb3aa54cf8aaeffe0a6706b7a9834ca4a2c0b781f /program
parenta128fafbe8ba5657f0c2cbc6dd2caeba79d4ad4c (diff)
- Backported r5704-r5705 from trunk
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_ldap.php5
-rw-r--r--program/localization/en_US/labels.inc1
2 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 7699c4494..a7ea62cfc 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -1298,12 +1298,13 @@ class rcube_ldap extends rcube_addressbook
if (!($value = $rec[$lf][$i]))
continue;
+ list($col, $subtype) = explode(':', $rf);
$out['_raw_attrib'][$lf][$i] = $value;
if ($rf == 'email' && $this->mail_domain && !strpos($value, '@'))
$out[$rf][] = sprintf('%s@%s', $value, $this->mail_domain);
- else if (in_array($rf, array('street','zipcode','locality','country','region')))
- $out['address'][$i][$rf] = $value;
+ else if (in_array($col, array('street','zipcode','locality','country','region')))
+ $out['address'.($subtype?':':'').$subtype][$i][$col] = $value;
else if ($rec[$lf]['count'] > 1)
$out[$rf][] = $value;
else
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index f192209ed..1250c0d08 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -252,7 +252,6 @@ $labels['nameprefix'] = 'Prefix';
$labels['namesuffix'] = 'Suffix';
$labels['nickname'] = 'Nickname';
$labels['jobtitle'] = 'Job Title';
-$labels['organization'] = 'Company';
$labels['department'] = 'Department';
$labels['gender'] = 'Gender';
$labels['maidenname'] = 'Maiden Name';