From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Mon, 22 Mar 2010 08:30:34 +0000 (+0100)
Subject: Fix medals fetching for Profiles
X-Git-Tag: xorg/1.0.0~332^2~26
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cef9e8c8af2545e6135419b0785174a9d8c412bb;p=platal.git

Fix medals fetching for Profiles

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php
index 815b438..1bbb91a 100644
--- a/include/profilefields.inc.php
+++ b/include/profilefields.inc.php
@@ -380,15 +380,16 @@ class ProfileMedals extends ProfileField
     {
         $this->pid = $it->value();
         while ($medal = $it->next()) {
-            $this->medals[$medal['mid']] = $medal['gid'];
+            $this->medals[$medal['mid']] = $medal;
         }
     }
 
     public static function fetchData(array $pids, $visibility)
     {
-        $data = XDB::iterator('SELECT  pm.pid, pm.mid, pm.gid
+        $data = XDB::iterator('SELECT  pm.pid, pm.mid, pm.gid, pme.text, pme.img
                                  FROM  profile_medals AS pm
                             LEFT JOIN  profiles AS p ON (pm.pid = p.pid)
+                            LEFT JOIN  profile_medal_enum AS pme ON (pme.id = pm.mid)
                                 WHERE  pm.pid IN {?} AND p.medals_pub IN {?}
                              ORDER BY  ' . XDB::formatCustomOrder('pm.pid', $pids),
                                 $pids, $visibility);