From 318665ddc0a020035c5ee122724fb29dcc29359b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Thu, 1 Jul 2010 15:03:06 +0200 Subject: [PATCH] Fix display of CV when logged and viewing profile view (Closes #1169) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- classes/profile.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/classes/profile.php b/classes/profile.php index ee23cab..fe929c1 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -841,8 +841,8 @@ class Profile $it = XDB::Iterator('SELECT p.pid, p.hrpid, p.xorg_id, p.ax_id, p.birthdate, p.birthdate_ref, p.next_birthday, p.deathdate, p.deathdate_rec, p.sex = \'female\' AS sex, - p.cv, p.medals_pub, p.alias_pub, p.email_directory, p.last_change, - p.nationality1, p.nationality2, p.nationality3, + IF ({?}, p.cv, NULL) AS cv, p.medals_pub, p.alias_pub, p.email_directory, + p.last_change, p.nationality1, p.nationality2, p.nationality3, IF (p.freetext_pub IN {?}, p.freetext, NULL) AS freetext, pe.entry_year, pe.grad_year, IF ({?}, pse.text, NULL) AS section, @@ -878,11 +878,12 @@ class Profile WHERE p.pid IN {?} GROUP BY p.pid ' . $order, - $visibility->levels(), - $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), - $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), - $visibility->levels(), - $visibility->levels(), + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // CV + $visibility->levels(), // freetext + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // section + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // nickname + $visibility->levels(), // mobile + $visibility->levels(), // photo $pids ); return new ProfileIterator($it, $pids, $fields, $visibility); -- 2.1.4