Merged rss fix from 1.8 MDL-10960

diff --git a/mod/data/rsslib.php b/mod/data/rsslib.php
index b39117bfcdcd8301dfb5eff4f15ac5260a96ac11..675c7b40eef578a39684e9bc9b7c55debdcff525 100644 (file)
--- 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)) {