From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Fri, 4 Jun 2010 22:40:30 +0000 (+0200)
Subject: Fix medal validation (Closes #1092)
X-Git-Tag: xorg/1.0.0~192
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8499e53613565ebe1d1ec9d83b575527b8c53d8d;p=platal.git

Fix medal validation (Closes #1092)
---

diff --git a/ChangeLog b/ChangeLog
index 2f7f1f1..1d63d86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ New:
         - Centralises email management through an email combobox           -JAC
 
 Bug/Wish:
+    * Admin:
+        - #1092: Fix medal validation                                      -Car
+
     * Core:
         - #1019: Allow 35 points passwords as announced                    -Car
         - #1059: Fix support of '?' in mail subjects                       -FRU
diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php
index 16f5b99..5067d8b 100644
--- a/include/validations/medals.inc.php
+++ b/include/validations/medals.inc.php
@@ -76,10 +76,9 @@ class MedalReq extends Validate
     {
         //var_dump($this);
         $r = XDB::query("
-            SELECT IF (g.text IS NOT NULL, CONCAT(m.text,' - ', g.text), m.text)
+            SELECT m.text
               FROM profile_medal_enum AS m
-         LEFT JOIN profile_medal_enum_grades AS g ON(g.mid = m.id AND g.gid = {?})
-             WHERE m.id = {?}", $this->gid, $this->mid);
+             WHERE m.id = {?}", $this->mid);
         return $r->fetchOneCell();
     }