X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fprofilefields.inc.php;h=b39b8f9b5767f5f57a0aa3092f977ca3def95015;hb=16d2c88314364b5e79936f4262d453dff03abdad;hp=968c4164daeb386cc67582237b9177f29f709110;hpb=8654c3fa625a13b16ec403b4ac26dabd761b97da;p=platal.git diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 968c416..b39b8f9 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -338,7 +338,7 @@ class ProfileEducation extends ProfileField $data = XDB::iterator('SELECT pe.id, pe.pid, pe.entry_year, pe.grad_year, pe.program, pe.flags, pee.name AS school, pee.abbreviation AS school_short, - pee.url AS school_url, gc.countryFR AS country, + pee.url AS school_url, gc.country, pede.degree, pede.abbreviation AS degree_short, pede.level AS degree_level, pefe.field FROM profile_education AS pe @@ -489,7 +489,7 @@ class ProfileMentoringCountries extends ProfileField public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.countryFR AS name + $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.country AS name FROM profile_mentor_country AS pmc LEFT JOIN geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pmc.country) WHERE pmc.pid IN {?}