MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge

2014-01-15 16:24:37 +13:00
parent 7f964cfdc7
commit e477ec0a39
1 changed files with 5 additions and 4 deletions
@@ -331,10 +331,11 @@ class badge {
     */
    public function has_awards() {
        global $DB;
-        if ($DB->record_exists('badge_issued', array('badgeid' => $this->id))) {
-            return true;
-        }
-        return false;
+        $awarded = $DB->record_exists_sql('SELECT b.uniquehash
+                    FROM {badge_issued} b INNER JOIN {user} u ON b.userid = u.id
+                    WHERE b.badgeid = :badgeid AND u.deleted = 0', array('badgeid' => $this->id));
+
+        return $awarded;
    }

    /**