diff --git a/lang/en/forum.php b/lang/en/forum.php index 9776488469c7a..6a2818746a0e0 100644 --- a/lang/en/forum.php +++ b/lang/en/forum.php @@ -25,6 +25,7 @@ $string['discussionmoved'] = "This discussion has been moved to '\$a'."; $string['discussions'] = "Discussions"; $string['discussionsstartedby'] = "Discussions started by \$a"; +$string['discussionsstartedbyrecent'] = "Discussions recently started by \$a"; $string['discussthistopic'] = "Discuss this topic"; $string['eachuserforum'] = "Each person posts one discussion"; $string['edit'] = "Edit"; diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 9a6aab8ff0638..fad7239166286 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -653,7 +653,7 @@ function forum_get_user_discussions($courseid, $userid) { AND p.userid = u.id AND u.id = '$userid' AND d.forum = f.id - ORDER BY p.created ASC"); + ORDER BY p.created DESC"); } @@ -1389,13 +1389,20 @@ function forum_delete_post($post) { function forum_print_user_discussions($courseid, $userid) { global $CFG, $USER; + $maxdiscussions = 10; + $countdiscussions = 0; + if ($discussions = forum_get_user_discussions($courseid, $userid)) { $user = get_record("user", "id", $userid); echo "
"; - print_heading( get_string("discussionsstartedby", "forum", "$user->firstname $user->lastname") ); + print_heading( get_string("discussionsstartedbyrecent", "forum", "$user->firstname $user->lastname") ); $replies = forum_count_discussion_replies(); foreach ($discussions as $discussion) { + $countdiscussions++; + if ($countdiscussions > $maxdiscussions) { + break; + } if (($discussion->forumtype == "teacher") and !isteacher($courseid)) { continue; }