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

[Jonathan Rivera <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php 
Log Message:
More about bugfix #6240


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.34
retrieving revision 1.36.2.15.2.35
diff -C2 -d -r1.36.2.15.2.34 -r1.36.2.15.2.35
*** class.uiaddressbook.inc.php 25 Nov 2003 21:07:15 -0000      1.36.2.15.2.34
--- class.uiaddressbook.inc.php 29 Nov 2003 03:52:55 -0000      1.36.2.15.2.35
***************
*** 1070,1074 ****
                                $defaul_orgs_name='entry[preferred_org]';
  
!                               $fields_to_search=array('org_id', 'org_name');
                                $this->get_orgs($fields_to_search, 
$fields['my_orgs']);
  
--- 1070,1074 ----
                                $defaul_orgs_name='entry[preferred_org]';
  
!                               $fields_to_search=array('contact_id', 
'org_name');
                                $this->get_orgs($fields_to_search, 
$fields['my_orgs']);
  
***************
*** 2904,2916 ****
                                foreach ($orgs as $k => $v)
                                {
!                                       if (is_array($current_orgs) && 
in_array($v['org_id'], $current_orgs))
                                        {
!                                               $this->my_orgs_data .= '<option 
value="' . $v['org_id'] . '">'
                                                        
.$v['org_name'].'</option>';
!                                               
$this->my_orgs_array[$v['org_id']] = $v['org_name'];
                                        }
                                        else
                                        {
!                                               $this->all_orgs_data .= 
'<option value="' . $v['org_id'] . '">'
                                                        
.$v['org_name'].'</option>';
                                        }
--- 2904,2916 ----
                                foreach ($orgs as $k => $v)
                                {
!                                       if (is_array($current_orgs) && 
in_array($v['contact_id'], $current_orgs))
                                        {
!                                               $this->my_orgs_data .= '<option 
value="' . $v['contact_id'] . '">'
                                                        
.$v['org_name'].'</option>';
!                                               
$this->my_orgs_array[$v['contact_id']] = $v['org_name'];
                                        }
                                        else
                                        {
!                                               $this->all_orgs_data .= 
'<option value="' . $v['contact_id'] . '">'
                                                        
.$v['org_name'].'</option>';
                                        }