From: Stéphane Jacob Date: Tue, 21 Sep 2010 21:54:03 +0000 (+0200) Subject: Fixes request for profile display. X-Git-Tag: xorg/1.0.1~162 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=52deb3aed2d9c5c04660c60440c62256e95a9cc0;p=platal.git Fixes request for profile display. Signed-off-by: Stéphane Jacob --- diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 8d3d59f..8863aa6 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -630,17 +630,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')); }