Fix admin/logger when the user has no entry in the aliases table.

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

diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php
index 8d3d59f..e841c16 100644 (file)
--- a/include/profilefields.inc.php
+++ b/include/profilefields.inc.php
@@ -33,7 +33,6 @@ abstract class ProfileField
         Profile::FETCH_MEDALS         => 'ProfileMedals',
         Profile::FETCH_NETWORKING     => 'ProfileNetworking',
         Profile::FETCH_PHONES         => 'ProfilePhones',
-        Profile::FETCH_MENTOR_SECTOR  => 'ProfileMentoringSectors',
         Profile::FETCH_MENTOR_COUNTRY => 'ProfileMentoringCountries',
         Profile::FETCH_JOB_TERMS      => 'ProfileJobTerms',
         Profile::FETCH_MENTOR_TERMS   => 'ProfileMentoringTerms',
@@ -193,10 +192,6 @@ class Job
     public $user_site;
     public $user_email;
 
-    public $sector;
-    public $subsector;
-    public $subsubsector;
-
     /** Fields are:
      * pid, id, company_id, description, url, email
      */
@@ -475,33 +470,6 @@ class ProfileCorps extends ProfileField
     }
 }
 // }}}
-// {{{ class ProfileMentoringSectors                  [ Field ]
-class ProfileMentoringSectors extends ProfileField
-{
-    public $sectors = array();
-
-    public function __construct(PlInnerSubIterator $it)
-    {
-        $this->pid = $it->value();
-        while ($sector = $it->next()) {
-            $this->sectors[] = $sector;
-        }
-    }
-
-    public static function fetchData(array $pids, ProfileVisibility $visibility)
-    {
-        $data = XDB::iterator('SELECT  pms.pid, pjse.name AS sector, pjsse.name AS subsector
-                                 FROM  profile_mentor_sector AS pms
-                            LEFT JOIN  profile_job_sector_enum AS pjse ON (pjse.id = pms.sectorid)
-                            LEFT JOIN  profile_job_subsector_enum AS pjsse ON (pjsse.id = pms.subsectorid)
-                                WHERE  pms.pid IN {?}
-                             ORDER BY  ' . XDB::formatCustomOrder('pms.pid', $pids),
-                                $pids);
-
-        return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid'));
-    }
-}
-// }}}
 // {{{ class ProfileMentoringCountries                [ Field ]
 class ProfileMentoringCountries extends ProfileField
 {
@@ -630,17 +598,11 @@ class ProfileJobs extends ProfileField
     public static function fetchData(array $pids, ProfileVisibility $visibility)
     {
         CompanyList::preload($pids);
-        $data = XDB::iterator('SELECT  pj.id, pj.pid, pj.description, pj.url as user_site,
-                                       IF(pj.email_pub IN {?}, pj.email, NULL) AS user_email,
-                                       pj.jobid, pjse.name AS sector, pjsse.name AS subsector,
-                                       pjssse.name AS subsubsector
-                                 FROM  profile_job AS pj
-                            LEFT JOIN  profile_job_sector_enum AS pjse ON (pjse.id = pj.sectorid)
-                            LEFT JOIN  profile_job_subsector_enum AS pjsse ON (pjsse.id = pj.subsectorid)
-                            LEFT JOIN  profile_job_subsubsector_enum AS pjssse ON (pjssse.id = pj.subsubsectorid)
-                                WHERE  pj.pid IN {?} AND pj.pub IN {?}
-                             ORDER BY  ' . XDB::formatCustomOrder('pid', $pids) . ',
-                                       pj.id',
+        $data = XDB::iterator('SELECT  id, pid, description, url as user_site, jobid,
+                                       IF(email_pub IN {?}, email, NULL) AS user_email
+                                 FROM  profile_job
+                                WHERE  pid IN {?} AND pub IN {?}
+                             ORDER BY  ' . XDB::formatCustomOrder('pid', $pids) . ', id',
                                  $visibility->levels(), $pids, $visibility->levels());
         return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid'));
     }