← Back to branch summary

~ubuntu-branches/ubuntu/utopic/moodle/utopic

« back to all changes in this revision

Viewing changes to mod/glossary/rsslib.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2014-05-12 16:10:38 UTC
  • mfrom: (36.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140512161038-puyqf65k4e0s8ytz
Tags: 2.6.3-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mod/glossary/rsslib.php
86
86
 
87
87
            foreach ($recs as $rec) {
88
88
                $item = new stdClass();
89
 
                $user = new stdClass();
90
89
                $item->title = $rec->entryconcept;
91
90
 
92
91
                if ($glossary->rsstype == 1) {//With author
93
 
                    $user->firstname = $rec->userfirstname;
94
 
                    $user->lastname = $rec->userlastname;
95
 
 
96
 
                    $item->author = fullname($user);
 
92
                    $item->author = fullname($rec);
97
93
                }
98
94
 
99
95
                $item->pubdate = $rec->entrytimecreated;
149
145
        }
150
146
 
151
147
        if ($glossary->rsstype == 1) {//With author
 
148
            $allnamefields = get_all_user_name_fields(true,'u');
152
149
            $sql = "SELECT e.id AS entryid,
153
150
                      e.concept AS entryconcept,
154
151
                      e.definition AS entrydefinition,
156
153
                      e.definitiontrust AS entrytrust,
157
154
                      e.timecreated AS entrytimecreated,
158
155
                      u.id AS userid,
159
 
                      u.firstname AS userfirstname,
160
 
                      u.lastname AS userlastname
 
156
                      $allnamefields
161
157
                 FROM {glossary_entries} e,
162
158
                      {user} u
163
159
                WHERE e.glossaryid = {$glossary->id} AND