diff options
author | alecpl <alec@alec.pl> | 2011-06-03 13:02:30 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-06-03 13:02:30 +0000 |
commit | 5148d388ea954ccb0320bd5b2e963c9018820938 (patch) | |
tree | eabfa265a7fcf9924ae963fec6a337568726c2e7 /program/include | |
parent | 02695eff93a218b81b301bc4d866e66e45953c5e (diff) |
- Small fix for advanced searching
Diffstat (limited to 'program/include')
-rw-r--r-- | program/include/rcube_contacts.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 6af438216..38a1f3742 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -321,7 +321,7 @@ class rcube_contacts extends rcube_addressbook $this->list_records(null, $i, true); while ($row = $this->result->next()) { $id = $row[$this->primary_key]; - $found = 0; + $found = array(); foreach (preg_grep($regexp, array_keys($row)) as $col) { $pos = strpos($col, ':'); $colname = $pos ? substr($col, 0, $pos) : $col; @@ -333,13 +333,13 @@ class rcube_contacts extends rcube_addressbook } $value = mb_strtolower($value); if (($strict && $value == $search) || (!$strict && strpos($value, $search) !== false)) { - $found++; + $found[$colname] = true; break; } } } // all fields match - if ($found >= $scnt) { + if (count($found) >= $scnt) { $ids[] = $id; } } |