mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-26 19:03:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-03-11 08:51:36 +13:00
commit 1fef3f6aac
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/wiki/lib.php
View File

@ -279,12 +279,10 @@ function wiki_supports($feature) {
function wiki_print_recent_activity($course, $viewfullnames, $timestart) {
global $CFG, $DB, $OUTPUT;
$usernamefields = get_all_user_name_fields(true, 'u');
$sql = "SELECT p.id, p.timemodified, p.subwikiid, sw.wikiid, w.wikimode, sw.userid, sw.groupid, $usernamefields
$sql = "SELECT p.id, p.timemodified, p.subwikiid, sw.wikiid, w.wikimode, sw.userid, sw.groupid
FROM {wiki_pages} p
JOIN {wiki_subwikis} sw ON sw.id = p.subwikiid
JOIN {wiki} w ON w.id = sw.wikiid
JOIN {user} u ON u.id = sw.userid
WHERE p.timemodified > ? AND w.course = ?
ORDER BY p.timemodified ASC";
if (!$pages = $DB->get_records_sql($sql, array($timestart, $course->id))) {