From 3e2637351da9559a4aa420004ac90e9fe30477ef Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 14 Feb 2011 15:46:48 -0500
Subject: [PATCH] Fulltext search over contact fields. Attention: DATABASE SCHEMA CHANGED\!
---
program/include/rcube_vcard.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 8253837..40544be 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -135,11 +135,15 @@
$typemap = $this->typemap;
// copy name fields to output array
- foreach (array('firstname','surname','middlename','nickname','organization') as $col)
- $out[$col] = $this->$col;
+ foreach (array('firstname','surname','middlename','nickname','organization') as $col) {
+ if (strlen($this->$col))
+ $out[$col] = $this->$col;
+ }
- $out['prefix'] = $this->raw['N'][0][3];
- $out['suffix'] = $this->raw['N'][0][4];
+ if ($this->raw['N'][0][3])
+ $out['prefix'] = $this->raw['N'][0][3];
+ if ($this->raw['N'][0][4])
+ $out['suffix'] = $this->raw['N'][0][4];
// convert from raw vcard data into associative data for Roundcube
foreach (array_flip($this->fieldmap) as $tag => $col) {
--
Gitblit v1.9.1