summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-06-24 10:48:29 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-06-24 10:48:29 (GMT)
commit46dc2e93ad2feaf2a15c9bb0cb988ecae16ec75f (patch)
tree35cb85a873313a65dc438a324ac7ce7b60797580
parent8297464ab4273f5662f1ce47a0c75bf602494e8a (diff)
downloadroundcubemail-plugins-kolab-46dc2e93ad2feaf2a15c9bb0cb988ecae16ec75f.tar.gz
Revert "Fix contact fulltext indexing with new email subtypes"
This reverts commit 9321a10124d1fbba87f8a25114fd583e385c2b66.
-rw-r--r--plugins/libkolab/lib/kolab_format_contact.php15
1 files changed, 2 insertions, 13 deletions
diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
index 9944c3d..3852fb7 100644
--- a/plugins/libkolab/lib/kolab_format_contact.php
+++ b/plugins/libkolab/lib/kolab_format_contact.php
@@ -31,7 +31,7 @@ class kolab_format_contact extends kolab_format
protected $read_func = 'readContact';
protected $write_func = 'writeContact';
- public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email:address');
+ public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email');
public $phonetypes = array(
'home' => Telephone::Home,
@@ -383,18 +383,7 @@ class kolab_format_contact extends kolab_format
{
$data = '';
foreach (self::$fulltext_cols as $col) {
- list($col, $field) = explode(':', $colname);
-
- if ($field) {
- $a = array();
- foreach ((array)$this->data[$col] as $attr)
- $a[] = $attr[$field];
- $val = join(' ', $a);
- }
- else {
- $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
- }
-
+ $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
if (strlen($val))
$data .= $val . ' ';
}