X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Feducation.func.inc.php;h=9d2e2b732bbbd8dc13c0d46df7bbf625b3d37607;hb=fb5a54cbdf4317488bc46c804e0df964c007eb4e;hp=68ec9b7d0a30f5239492f8655847c6143c25656e;hpb=e4cd7a1f6c6ec37d85eb114727cc048ea17306b7;p=platal.git

diff --git a/include/education.func.inc.php b/include/education.func.inc.php
index 68ec9b7..9d2e2b7 100644
--- a/include/education.func.inc.php
+++ b/include/education.func.inc.php
@@ -60,33 +60,25 @@ Platal::page()->register_function('education_options', '_education_options_smart
  */
 function education_degree()
 {
-    $html = "";
-    $res = XDB::iterRow("SELECT  d.eduid, d.degreeid
-                           FROM  profile_education_enum   AS e
-                     INNER JOIN  profile_education_degree AS d  ON (e.id = d.eduid)
-                      LEFT JOIN  geoloc_countries         AS gc ON (e.country = gc.a2)
-                       ORDER BY  gc.countryFR, e.name");
-    if ($edu_degree = $res->next()) {
-        $eduid = $edu_degree['0'];
-        $html .= "[";
-        $html .= $edu_degree['1'];
-        $edu_degree = $res->next();
-        while ($edu_degree['0'] == $eduid) {
-            $html .= "," . $edu_degree['1'];
+    $html  = '';
+    $res = XDB::iterRow("SELECT  eduid, degreeid
+                           FROM  profile_education_degree
+                       ORDER BY  eduid");
+    $edu_degree = $res->next();
+    for ($eduid = 1; $edu_degree; ++$eduid) {
+        $html .= '[';
+        if ($edu_degree['0'] == $eduid) {
+            $html .= $edu_degree['1'];
             $edu_degree = $res->next();
+            while ($edu_degree['0'] == $eduid) {
+                $html .= ',' . $edu_degree['1'];
+                $edu_degree = $res->next();
+            }
         }
-        $html .= "]";
-    }
-    while ($edu_degree) {
-        $eduid = $edu_degree['0'];
-        $html .= ",\n[";
-        $html .= $edu_degree['1'];
-        $edu_degree = $res->next();
-        while ($edu_degree['0'] == $eduid) {
-            $html .= "," . $edu_degree['1'];
-            $edu_degree = $res->next();
+        $html .= ']';
+        if ($edu_degree) {
+            $html .= ",\n";
         }
-        $html .= "]";
     }
     return $html;
 }