Merge branch 'xorg/master' into xorg/f/geocoding

[platal.git] / include / profilefields.inc.php

diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php
index 6192575..8d4ef1b 100644 (file)
--- a/include/profilefields.inc.php
+++ b/include/profilefields.inc.php
@@ -644,7 +644,7 @@ class ProfileJobs extends ProfileField
     {
         $a = $addresses->get(Profile::ADDRESS_PRO);
         foreach ($a as $address) {
-            if ($address->type == Address::LINK_JOB && array_key_exists($address->jobid, $this->jobs)) {
+            if ($address->type == Address::LINK_JOB && array_key_exists($address->id, $this->jobs)) {
                 $this->jobs[$address->id]->setAddress($address);
             }
         }
@@ -735,8 +735,7 @@ class CompanyList
         }
 
         $it = XDB::iterator('SELECT  pje.id, pje.name, pje.acronym, pje.url,
-                                     pa.flags, pa.text, pa.postalCode, pa.countryId,
-                                     pa.type, pa.pub
+                                     pa.flags, pa.text, pa.type, pa.pub
                                FROM  profile_job_enum AS pje
                           LEFT JOIN  profile_addresses AS pa ON (pje.id = pa.jobid AND pa.type = \'hq\')
                                   ' . $join . '