From: moodler <moodler>
Date: Thu, 23 Aug 2007 06:14:26 +0000 (+0000)
Subject: Merged rss fix from 1.8    MDL-10960
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3be1eb52383f1fbc74dc43a759470ebdc2e44408;p=moodle.git

Merged rss fix from 1.8    MDL-10960
---

diff --git a/mod/data/rsslib.php b/mod/data/rsslib.php
index b39117bfcd..675c7b40ee 100644
--- a/mod/data/rsslib.php
+++ b/mod/data/rsslib.php
@@ -37,9 +37,10 @@
                         // Get the data_records out.
                         $approved = ($data->approval) ? ' AND dr.approved = 1 ' : ' ';
 
-                        $sql = 'SELECT dr.* ' .
-                                    "FROM {$CFG->prefix}data_records dr " .
+                        $sql = 'SELECT dr.*, u.firstname, u.lastname ' .
+                                    "FROM {$CFG->prefix}data_records dr, {$CFG->prefix}user u " .
                                     "WHERE dr.dataid = {$data->id} " .$approved.
+                                    '  AND dr.userid = u.id '.
                                     'ORDER BY dr.timecreated DESC';
 
                         if (!$records = get_records_sql($sql, 0, $data->rssarticles)) {