diff options
| author | alecpl <alec@alec.pl> | 2011-11-04 09:08:54 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-04 09:08:54 +0000 |
| commit | 179b39d22a68db1f31947aca4d31eb1e53d193a7 (patch) | |
| tree | 8eceb5976f1c54f62a3f84fdccb36dfcae6f2aa2 | |
| parent | 9aab5e54568f6bc4071afd3ad0c5570abd98fa5c (diff) | |
- Fix error on opening searched LDAP contact (#1488144)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/addressbook/func.inc | 9 |
2 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix error on opening searched LDAP contact (#1488144) - Fix redundant line break in flowed format (#1488146) - TinyMCE: - updated to 3.4.6 diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 2b06e62cd..79a0babb8 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -763,9 +763,12 @@ function rcmail_get_cids() foreach ($cid as $id) { // if _source is not specified we'll find it from decoded ID if (!$got_source) { - list ($c, $s) = explode('-', $id, 2); - if (strlen($s)) { - $result[(string)$s][] = $c; + if ($sep = strrpos($id, '-')) { + $contact_id = substr($id, 0, $sep); + $source_id = substr($id, $sep+1); + if (strlen($source_id)) { + $result[(string)$source_id][] = $contact_id; + } } } else { |