Skip to content

Commit

Permalink
MDL-25068 forum: fixed error string usage
Browse files Browse the repository at this point in the history
The string [cannotsubscribe,mod_forum] is supposed to be used for group
membership check only. I have fixed the two other usages of the string.
Note that the condition if (forum_subscribe()) was useless as the
function return true values only now after $DB conversion.
  • Loading branch information
mudrd8mz committed Dec 7, 2010
1 parent 9a3adb2 commit d1571da
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions mod/forum/subscribe.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -132,13 +132,9 @@
print_error('disallowsubscribe', 'forum', $_SERVER["HTTP_REFERER"]); print_error('disallowsubscribe', 'forum', $_SERVER["HTTP_REFERER"]);
} }
if (!has_capability('mod/forum:viewdiscussion', $context)) { if (!has_capability('mod/forum:viewdiscussion', $context)) {
print_error('cannotsubscribe', 'forum', $_SERVER["HTTP_REFERER"]); print_error('noviewdiscussionspermission', 'forum', $_SERVER["HTTP_REFERER"]);
}
if (forum_subscribe($user->id, $forum->id) ) {
add_to_log($course->id, "forum", "subscribe", "view.php?f=$forum->id", $forum->id, $cm->id);
redirect($returnto, get_string("nowsubscribed", "forum", $info), 1);
} else {
print_error('cannotsubscribe', 'forum', $_SERVER["HTTP_REFERER"]);
} }
forum_subscribe($user->id, $forum->id);
add_to_log($course->id, "forum", "subscribe", "view.php?f=$forum->id", $forum->id, $cm->id);
redirect($returnto, get_string("nowsubscribed", "forum", $info), 1);
} }

0 comments on commit d1571da

Please sign in to comment.