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, 11 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index 9c9973f25..3cb47480a 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -407,6 +407,17 @@ class rcube_ldap extends rcube_addressbook
 
         $filter = '(|';
         $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : '';
+        if ($fields != '*')
+        {
+            // search_fields are required for fulltext search
+            if (!$this->prop['search_fields'])
+            {
+                $this->set_error(self::ERROR_SEARCH, 'nofulltextsearch');
+                $this->result = new rcube_result_set();
+                return $this->result;
+            }
+        }
+        
         if (is_array($this->prop['search_fields']))
         {
             foreach ($this->prop['search_fields'] as $k => $field)