[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.33, 1.36.2.15.2.34

[Jonathan Rivera <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv27655/addressbook/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php 
Log Message:
Bugfix #6240, this was a problem with keys in array.


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.33
retrieving revision 1.36.2.15.2.34
diff -C2 -d -r1.36.2.15.2.33 -r1.36.2.15.2.34
*** class.uiaddressbook.inc.php 19 Nov 2003 05:14:48 -0000      1.36.2.15.2.33
--- class.uiaddressbook.inc.php 25 Nov 2003 21:07:15 -0000      1.36.2.15.2.34
***************
*** 1097,1101 ****
                                //$defaul_person_name='entry[current_person]';
  
!                               $fields_to_search=array('person_id', 
'per_full_name');
                                $this->get_persons($fields_to_search, 
$fields['my_person']);
  
--- 1097,1101 ----
                                //$defaul_person_name='entry[current_person]';
  
!                               $fields_to_search=array('contact_id', 
'per_full_name');
                                $this->get_persons($fields_to_search, 
$fields['my_person']);
  
***************
*** 2876,2892 ****
                        $criteria = 
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'');
                        $persons = 
$this->bo->get_persons($fields_to_search,'','','','','',$criteria);
                        if ($persons)
                        {
                                foreach ($persons as $k => $v)
                                {
!                                       if (is_array($current_person) && 
in_array($v['person_id'], $current_person))
                                        {
!                                               $this->my_person_data .= 
'<option value="' . $v['person_id'] . '">'
                                                        
.$v['per_full_name'].'</option>';
!                                               
$this->my_person_array[$v['person_id']] = $v['per_first_name'];
                                        }
                                        else
                                        {
!                                               $this->all_person_data .= 
'<option value="' . $v['person_id'] . '">'
                                                        
.$v['per_full_name'].'</option>';
                                        }
--- 2876,2893 ----
                        $criteria = 
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'');
                        $persons = 
$this->bo->get_persons($fields_to_search,'','','','','',$criteria);
+ 
                        if ($persons)
                        {
                                foreach ($persons as $k => $v)
                                {
!                                       if (is_array($current_person) && 
in_array($v['contact_id'], $current_person))
                                        {
!                                               $this->my_person_data .= 
'<option value="' . $v['contact_id'] . '">'
                                                        
.$v['per_full_name'].'</option>';
!                                               
$this->my_person_array[$v['contact_id']] = $v['per_first_name'];
                                        }
                                        else
                                        {
!                                               $this->all_person_data .= 
'<option value="' . $v['contact_id'] . '">'
                                                        
.$v['per_full_name'].'</option>';
                                        }