Merge branch 'MDL-55994' of https://github.com/bostelm/moodle

robjoyce · Nov 11, 2016 · 56fb91b · 56fb91b
2 parents 9c56f90 + f8b56ac
commit 56fb91b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/blog/rsslib.php b/blog/rsslib.php
@@ -211,7 +211,7 @@ function blog_rss_get_feed($context, $args) {
     if ($blogentries) {
         $items = array();
         foreach ($blogentries as $blogentry) {
-            $item = null;
+            $item = new stdClass();
             $item->author = fullname($DB->get_record('user', array('id' => $blogentry->userid))); // TODO: this is slow.
             $item->title = $blogentry->subject;
             $item->pubdate = $blogentry->lastmodified;
@@ -234,7 +234,7 @@ function blog_rss_get_feed($context, $args) {
 
     switch ($type) {
         case 'user':
-            $info = fullname($DB->get_record('user', array('id' => $id), 'firstname,lastname'));
+            $info = fullname($DB->get_record('user', array('id' => $id), get_all_user_name_fields(true)));
             break;
         case 'course':
             $info = $DB->get_field('course', 'fullname', array('id' => $id));