[Phpgroupware-cvs] [19108] partial merge for contacts classes (rev 19090 and 19092), was already partially fixed

[Caeies]

Revision: 19108
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19108
Author:   Caeies
Date:     2009-03-11 18:29:39 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
partial merge for contacts classes (rev 19090 and 19092), was already partially 
fixed

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19090

Modified Paths:
--------------
    core/trunk/phpgwapi/inc/class.contact_person.inc.php
    core/trunk/phpgwapi/inc/class.contacts_sql.inc.php

Modified: core/trunk/phpgwapi/inc/class.contact_person.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contact_person.inc.php        2009-03-11 
16:10:18 UTC (rev 19107)
+++ core/trunk/phpgwapi/inc/class.contact_person.inc.php        2009-03-11 
18:29:39 UTC (rev 19108)
@@ -335,9 +335,12 @@
 
                function full_name()
                {
-                       $this->add_field('per_full_name', 
phpgwapi_sql::concat_null(array($this->real_field('per_first_name'), 
phpgwapi_sql::string(' '),
+
+                       $this->add_field('per_full_name', 
phpgwapi_sql::concat_null(array($this->real_field('per_prefix'), 
phpgwapi_sql::string(' '),
+                                                                               
 $this->real_field('per_first_name'), phpgwapi_sql::string(' '),
                                                                                
 $this->real_field('per_middle_name'), phpgwapi_sql::string(' '),
-                                                                               
 $this->real_field('per_last_name'))));
+                                                                               
 $this->real_field('per_last_name'), phpgwapi_sql::string(' '),
+                                                                               
 $this->real_field('per_suffix'))));
                }
 
        }

Modified: core/trunk/phpgwapi/inc/class.contacts_sql.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.contacts_sql.inc.php  2009-03-11 16:10:18 UTC 
(rev 19107)
+++ core/trunk/phpgwapi/inc/class.contacts_sql.inc.php  2009-03-11 18:29:39 UTC 
(rev 19108)
@@ -1206,7 +1206,7 @@
                        $this->criteria(array('contact_id' => $contact_id));
                        if($get_org==True)
                        {
-                               $this->request(array('org_name', 'people', 
'org_id'));
+                               $this->request(array('org_name', 'org_id', 
'people'));
                                $this->criteria(array('my_preferred' => 'Y'));
                        }
                        return $this->get_query($action, __LINE__, __FILE__);