diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-05-15 13:48:13 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-05-15 13:48:13 +0200 |
| commit | ceb5b56c3b8db37425338e9c2661c5c4bc4ac069 (patch) | |
| tree | cc28991a9f6aa3b3f55034f3d9ea4d0c97438a43 /program/include/rcube_contacts.php | |
| parent | 92be3ee4a471406bc75b345760584cc317b289fe (diff) | |
Move rcube_addressbook::normalize_string() to rcube_utils::normalize_string() for general purpose
Diffstat (limited to 'program/include/rcube_contacts.php')
| -rw-r--r-- | program/include/rcube_contacts.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 8834a7dbc..4ebe1b15e 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -313,7 +313,7 @@ class rcube_contacts extends rcube_addressbook // fulltext search in all fields else if ($col == '*') { $words = array(); - foreach (explode($WS, self::normalize_string($value)) as $word) { + foreach (explode($WS, rcube_utils::normalize_string($value)) as $word) { switch ($mode) { case 1: // strict $words[] = '(' . $this->db->ilike('words', $word . '%') @@ -352,7 +352,7 @@ class rcube_contacts extends rcube_addressbook // vCard field else { if (in_array($col, $this->fulltext_cols)) { - foreach (explode(" ", self::normalize_string($val)) as $word) { + foreach (rcube_utils::normalize_string($val, true) as $word) { switch ($mode) { case 1: // strict $words[] = '(' . $this->db->ilike('words', $word . $WS . '%') @@ -728,9 +728,9 @@ class rcube_contacts extends rcube_addressbook if (isset($value)) $vcard->set($field, $value, $section); if ($fulltext && is_array($value)) - $words .= ' ' . self::normalize_string(join(" ", $value)); + $words .= ' ' . rcube_utils::normalize_string(join(" ", $value)); else if ($fulltext && strlen($value) >= 3) - $words .= ' ' . self::normalize_string($value); + $words .= ' ' . rcube_utils::normalize_string($value); } } $out['vcard'] = $vcard->export(false); |