Fulltext search over contact fields. Attention: DATABASE SCHEMA CHANGED\!

git-svn-id: https://svn.roundcube.net/trunk@4541 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 8 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_vcard.php b/roundcubemail/program/include/rcube_vcard.php
index 82538379f..40544be90 100644
--- a/roundcubemail/program/include/rcube_vcard.php
+++ b/roundcubemail/program/include/rcube_vcard.php
@@ -135,11 +135,15 @@ class rcube_vcard
     $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) {