mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-42579 Glossary: Fix debug notice from missing name fields.

Browse Source
This commit is contained in:
Stephen Bourget 2013-10-29 22:56:53 -04:00
parent 68291f2d57
commit bd56062327
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/glossary/rsslib.php
View File

@ -86,14 +86,10 @@
foreach ($recs as $rec) {
$item = new stdClass();
$user = new stdClass();
$item->title = $rec->entryconcept;
if ($glossary->rsstype == 1) {//With author
$user->firstname = $rec->userfirstname;
$user->lastname = $rec->userlastname;
$item->author = fullname($user);
$item->author = fullname($rec);
}
$item->pubdate = $rec->entrytimecreated;
@ -149,6 +145,7 @@
}
if ($glossary->rsstype == 1) {//With author
$allnamefields = get_all_user_name_fields(true,'u');
$sql = "SELECT e.id AS entryid,
e.concept AS entryconcept,
e.definition AS entrydefinition,
@ -156,8 +153,7 @@
e.definitiontrust AS entrytrust,
e.timecreated AS entrytimecreated,
u.id AS userid,
u.firstname AS userfirstname,
u.lastname AS userlastname
$allnamefields
FROM {glossary_entries} e,
{user} u
WHERE e.glossaryid = {$glossary->id} AND