From d1571da6c8d23f108e3246a1ff2b9a5d8df646fd Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Tue, 7 Dec 2010 12:34:35 +0000 Subject: [PATCH] MDL-25068 forum: fixed error string usage 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. --- mod/forum/subscribe.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 9d7345af17a..75efa7bbf7e 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -132,13 +132,9 @@ if (forum_is_subscribed($user->id, $forum->id)) { print_error('disallowsubscribe', 'forum', $_SERVER["HTTP_REFERER"]); } if (!has_capability('mod/forum:viewdiscussion', $context)) { - print_error('cannotsubscribe', '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"]); + print_error('noviewdiscussionspermission', '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); } -