MDL-13565 Tracking forum fixes; merged from MOODLE_19_STABLE

This commit is contained in:
skodak 2008-02-24 10:55:53 +00:00
parent 48441521aa
commit 2459ecc419

View file

@ -179,7 +179,10 @@
} }
if ($usetracking) { if ($usetracking) {
if (($forum->trackingtype == FORUM_TRACKING_ON) || !isset($untracked[$forum->id])) { if ($forum->trackingtype == FORUM_TRACKING_OFF) {
$unreadlink = '-';
$trackedlink = '-';
} else if (($forum->trackingtype == FORUM_TRACKING_ON) || !isset($untracked[$forum->id])) {
$groupid = ($groupmode==SEPARATEGROUPS && !has_capability('moodle/site:accessallgroups', $context)) ? $currentgroup : false; $groupid = ($groupmode==SEPARATEGROUPS && !has_capability('moodle/site:accessallgroups', $context)) ? $currentgroup : false;
$unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid); $unread = forum_tp_count_forum_unread_posts($USER->id, $forum->id, $groupid);
if ($unread > 0) { if ($unread > 0) {
@ -337,7 +340,11 @@
} }
if ($usetracking) { if ($usetracking) {
if (($forum->trackingtype == FORUM_TRACKING_ON) || if ($forum->trackingtype == FORUM_TRACKING_OFF) {
$unreadlink = '-';
$trackedlink = '-';
} else if (($forum->trackingtype == FORUM_TRACKING_ON) ||
!isset($untracked[$forum->id])) { !isset($untracked[$forum->id])) {
$groupid = ($groupmode==SEPARATEGROUPS $groupid = ($groupmode==SEPARATEGROUPS
&& !has_capability('moodle/site:accessallgroups', $context)) && !has_capability('moodle/site:accessallgroups', $context))
@ -353,6 +360,8 @@
if ($forum->trackingtype == FORUM_TRACKING_OPTIONAL) { if ($forum->trackingtype == FORUM_TRACKING_OPTIONAL) {
$trackedlink = '<a title="'.$strnotrackforum.'" href="settracking.php?id='. $trackedlink = '<a title="'.$strnotrackforum.'" href="settracking.php?id='.
$forum->id.'">'.$stryes.'</a>'; $forum->id.'">'.$stryes.'</a>';
} else {
$trackedlink = $stryes;
} }
} else { } else {
$unreadlink = '-'; $unreadlink = '-';