[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.39, 1.17.2.2.2.40

[Alejandro Borges (lex) <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv4523/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php 
Log Message:
Fixes 6931


Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.39
retrieving revision 1.17.2.2.2.40
diff -C2 -d -r1.17.2.2.2.39 -r1.17.2.2.2.40
*** class.contacts_sql.inc.php  2 Dec 2003 22:49:52 -0000       1.17.2.2.2.39
--- class.contacts_sql.inc.php  3 Dec 2003 19:25:05 -0000       1.17.2.2.2.40
***************
*** 478,482 ****
                                                'per_modon',
                                                'key_addr_id',
!                                               'addr_descritpion',
                                                'addr_add1',
                                                'addr_add2',
--- 478,482 ----
                                                'per_modon',
                                                'key_addr_id',
!                                               'addr_description',
                                                'addr_add1',
                                                'addr_add2',
***************
*** 3148,3151 ****
--- 3148,3161 ----
                                }
                        }
+ 
+                       $index = array_search('per_full_name', $search_fields); 
+                       if($index)
+                       {
+                               unset($search_fields[$index]);
+                               $search_fields[] = 'per_first_name';
+                               $search_fields[] = 'per_last_name';
+                               $search_fields[] = 'per_middle_name';
+                       }
+ 
                        $location = CreateObject('phpgwapi.contact_addr');
                        $search_fields = (empty($search_fields) || 
!is_array($search_fields)) ? array() : $search_fields;
***************
*** 3171,3174 ****
--- 3181,3193 ----
                        if(count($search_fields) > 0 && $pattern)
                        {
+                               $index = array_search('per_full_name', 
$search_fields); 
+                               if($index)
+                               {
+                                       unset($search_fields[$index]);
+                                       $search_fields[] = 'per_first_name';
+                                       $search_fields[] = 'per_last_name';
+                                       $search_fields[] = 'per_middle_name';
+                               }
+ 
                                foreach($search_fields as $field)
                                {