Merge branch 'MDL-53851-30' of https://github.com/blckct/moodle into MOODLE_30_STABLE

This commit is contained in:
David Monllao
2016-05-31 11:47:10 +08:00
+2 -2
View File
@@ -81,7 +81,6 @@ class block_news_items extends block_base {
$groupmode = groups_get_activity_groupmode($cm);
$currentgroup = groups_get_activity_group($cm, true);
if (forum_user_can_post_discussion($forum, $currentgroup, $groupmode, $cm, $context)) {
$text .= '<div class="newlink"><a href="'.$CFG->wwwroot.'/mod/forum/post.php?forum='.$forum->id.'">'.
get_string('addanewtopic', 'forum').'</a>...</div>';
@@ -95,7 +94,8 @@ class block_news_items extends block_base {
// in the future.
$sort = forum_get_default_sort_order(true, 'p.modified');
if (! $discussions = forum_get_discussions($cm, $sort, false,
$currentgroup, $this->page->course->newsitems) ) {
-1, $this->page->course->newsitems,
false, -1, 0, FORUM_POSTS_ALL_USER_GROUPS) ) {
$text .= '('.get_string('nonews', 'forum').')';
$this->content->text = $text;
return $this->content;