moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved handling of userlastmodified

Browse source
This commit is contained in:
moodler 2005-04-22 18:53:04 +00:00
parent 2a1e149c95
commit 096de9addc
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/forum/lib.php
View file

@ -1253,11 +1253,9 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
if (empty($userlastmodified)) { // We don't need to know this if (empty($userlastmodified)) { // We don't need to know this
$umfields = ''; $umfields = '';
$umtable = ''; $umtable = '';
$umselect = '';
} else { } else {
$umfields = ',um.firstname AS umfirstname, um.lastname AS umlastname'; $umfields = ', um.firstname AS umfirstname, um.lastname AS umlastname';
$umtable = ' ,'.$CFG->prefix.'user um '; $umtable = ' LEFT JOIN user um on (d.usermodified = um.id)';
$umselect = ' AND (d.usermodified = um.id OR d.usermodified = 0)';
} }
return get_records_sql("SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid, return get_records_sql("SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid,
@ -1269,7 +1267,7 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
WHERE d.forum = '$forum' WHERE d.forum = '$forum'
AND p.discussion = d.id AND p.discussion = d.id
AND p.parent = 0 AND p.parent = 0
AND p.userid = u.id $groupselect $userselect $umselect AND p.userid = u.id $groupselect $userselect
ORDER BY $forumsort $limit"); ORDER BY $forumsort $limit");
} }
@ -2535,7 +2533,9 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
/// Get all the recent discussions we're allowed to see /// Get all the recent discussions we're allowed to see
if (! $discussions = forum_get_discussions($forum->id, $sort, 0, $fullpost, $visiblegroups) ) { $getuserlastmodified = ($displayformat == 'header');
if (! $discussions = forum_get_discussions($forum->id, $sort, 0, $fullpost, $visiblegroups,0,$getuserlastmodified) ) {
echo '<div class="forumnodiscuss">'; echo '<div class="forumnodiscuss">';
if ($forum->type == 'news') { if ($forum->type == 'news') {
echo '('.get_string('nonews', 'forum').')'; echo '('.get_string('nonews', 'forum').')';