Merge branch 'MDL-48338-master' of git://github.com/andrewnicols/moodle

moodle · Feb 11, 2019 · 67d490b · 67d490b
2 parents 4de1ac1 + 428db95
commit 67d490b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mod/forum/index.php b/mod/forum/index.php
@@ -240,7 +240,7 @@
                 if (isset($untracked[$forum->id])) {
                         $unreadlink  = '-';
                 } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
-                    $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
+                    $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'#unread">'.$unread.'</a>';
                     $icon = $OUTPUT->pix_icon('t/markasread', $strmarkallread);
                     $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
                                    $forum->id.'&amp;mark=read&amp;sesskey=' . sesskey() . '">' . $icon . '</a></span>';
@@ -371,7 +371,7 @@
                     if (isset($untracked[$forum->id])) {
                         $unreadlink  = '-';
                     } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
-                        $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
+                        $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'#unread">'.$unread.'</a>';
                         $icon = $OUTPUT->pix_icon('t/markasread', $strmarkallread);
                         $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
                                        $forum->id.'&amp;mark=read&sesskey=' . sesskey() . '">' . $icon . '</a></span>';

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -6708,7 +6708,7 @@ function forum_cm_info_view(cm_info $cm) {
 
     if (forum_tp_can_track_forums()) {
         if ($unread = forum_tp_count_forum_unread_posts($cm, $cm->get_course())) {
-            $out = '<span class="unread"> <a href="' . $cm->url . '">';
+            $out = '<span class="unread"> <a href="' . $cm->url . '#unread">';
             if ($unread == 1) {
                 $out .= get_string('unreadpostsone', 'forum');
             } else {