L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-32125-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2013-03-04 10:30:24 +13:00
parent 69313ec423 d6c3051a52
commit 0897b1eab1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+8
View File
@@ -214,6 +214,14 @@ function forum_update_instance($forum, $mform) {
$DB->update_record('forum', $forum);
$modcontext = get_context_instance(CONTEXT_MODULE, $forum->coursemodule);
if (($forum->forcesubscribe == FORUM_INITIALSUBSCRIBE) && ($oldforum->forcesubscribe <> $forum->forcesubscribe)) {
$users = forum_get_potential_subscribers($modcontext, 0, 'u.id, u.email', '');
foreach ($users as $user) {
forum_subscribe($user->id, $forum->id);
}
}
forum_grade_item_update($forum);
return true;
mod/forum/subscribe.php
+6
View File
@@ -111,6 +111,12 @@ if (!is_null($mode) and has_capability('mod/forum:managesubscriptions', $context
redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1);
break;
case FORUM_INITIALSUBSCRIBE : // 2
if ($forum->forcesubscribe <> FORUM_INITIALSUBSCRIBE) {
$users = forum_get_potential_subscribers($context, 0, 'u.id, u.email', '');
foreach ($users as $user) {
forum_subscribe($user->id, $forum->id);
}
}
forum_forcesubscribe($forum->id, FORUM_INITIALSUBSCRIBE);
redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1);
break;