Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle

This commit is contained in:
David Monllao 2016-04-20 11:10:23 +08:00
commit d7eb33652f

View File

@ -1823,8 +1823,6 @@ function forum_get_all_discussion_posts($discussionid, $sort, $tracking=false) {
$params = array();
if ($tracking) {
$now = time();
$cutoffdate = $now - ($CFG->forum_oldpostdays * 24 * 3600);
$tr_sel = ", fr.id AS postread";
$tr_join = "LEFT JOIN {forum_read} fr ON (fr.postid = p.id AND fr.userid = ?)";
$params[] = $USER->id;
@ -2935,8 +2933,6 @@ function forum_get_discussions_count($cm) {
$groupselect = "";
}
$cutoffdate = $now - ($CFG->forum_oldpostdays*24*60*60);
$timelimit = "";
if (!empty($CFG->forum_enabletimedposts)) {