X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Feducation.func.inc.php;h=fce66c3d3e69e4f268bbca1b38ac9ec3e5a3238f;hb=517ecea1229f166ce51fe443f428381ad5912f83;hp=16cca5764cc6aa74f2f611071c54f11d028e72c0;hpb=0073747ac81cc9cff9e43847eb008f0e815255f0;p=platal.git

diff --git a/include/education.func.inc.php b/include/education.func.inc.php
index 16cca57..fce66c3 100644
--- a/include/education.func.inc.php
+++ b/include/education.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2013 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,20 +21,24 @@
 
 function education_options($current = 0)
 {
-    $html = '<option value="-1"></option>';
-    $res  = XDB::iterator("SELECT  e.id AS id, gc.countryFR AS country,
+    $html = '<option value="-1">&nbsp;</option>';
+    $res  = XDB::iterator("SELECT  e.id AS id, gc.country,
                                    IF(CHAR_LENGTH(e.name) > 76, e.abbreviation, e.name) AS name
                              FROM  profile_education_enum AS e
                         LEFT JOIN  geoloc_countries       AS gc ON (e.country = gc.iso_3166_1_a2)
                      WHERE EXISTS  (SELECT  *
                                       FROM  profile_education_degree AS d
-                                     WHERE  e.id = d.eduid)
-                         ORDER BY  gc.countryFR, e.name");
+                                     WHERE  e.id = d.eduid) AND e.name != {?}
+                         ORDER BY  gc.country, e.name",
+                          Profile::EDU_X);
     $country = "";
     while ($arr_edu = $res->next()) {
         if ($arr_edu["country"] != $country) {
+            if ($country) {
+                $html .= '</optgroup>';
+            }
             $country = $arr_edu["country"];
-            $html .= "<optgroup label=" . $country . ">";
+            $html .= '<optgroup label="' . $country . '">';
         }
         $html .= '<option value="' . $arr_edu["id"] . '"';
         if ($arr_edu["id"] == $current) {
@@ -42,6 +46,9 @@ function education_options($current = 0)
         }
         $html .= '>' . htmlspecialchars($arr_edu["name"]) . "</option>\n";
     }
+    if ($country) {
+        $html .= '</optgroup>';
+    }
     return $html;
 }