mirror of
https://github.com/moodle/moodle.git
synced 2025-02-16 05:45:36 +01:00
Now forum_get_discussions() is using $limitfrom and $limitnum
This commit is contained in:
parent
c5836b7814
commit
9eabd190c1
@ -1445,10 +1445,10 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
|
|||||||
$userselect = "";
|
$userselect = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$limitfrom = 0;
|
||||||
|
$limitnum = 0;
|
||||||
if ($limit) {
|
if ($limit) {
|
||||||
$limit = " LIMIT $limit ";
|
$limitnum = $limit;
|
||||||
} else {
|
|
||||||
$limit = "";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($visiblegroups == -1) {
|
if ($visiblegroups == -1) {
|
||||||
@ -1485,7 +1485,7 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
|
|||||||
WHERE d.forum = '$forum'
|
WHERE d.forum = '$forum'
|
||||||
AND p.parent = 0
|
AND p.parent = 0
|
||||||
$timelimit $groupselect $userselect
|
$timelimit $groupselect $userselect
|
||||||
ORDER BY $forumsort $limit");
|
ORDER BY $forumsort", $limitfrom, $limitnum);
|
||||||
} else {
|
} else {
|
||||||
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,
|
||||||
u.firstname, u.lastname, u.email, u.picture $umfields
|
u.firstname, u.lastname, u.email, u.picture $umfields
|
||||||
@ -1497,7 +1497,7 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC",
|
|||||||
AND p.discussion = d.id
|
AND p.discussion = d.id
|
||||||
AND p.parent = 0
|
AND p.parent = 0
|
||||||
AND p.userid = u.id $timelimit $groupselect $userselect
|
AND p.userid = u.id $timelimit $groupselect $userselect
|
||||||
ORDER BY $forumsort $limit");
|
ORDER BY $forumsort", $limitfrom, $limitnum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user