Merged from 1.7.

diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 0d96a41a1f7e28be5110128da9a6a797a3663e75..487be0e2cd96b191e527a1ac9e925363d54337a6 100644 (file)
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -18,14 +18,7 @@
     }
 
     if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-        
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-        if (groupmode($course, $cm) and
-                    !has_capability('moodle/site:accessallgroups', $context)) {
-            if (!mygroupid($course->id)) {
-                error('Sorry, but you must be a group member to subscribe.');
-            }
-        }
     } else {
         $cm->id = 0;
         $context = get_context_instance(CONTEXT_MODULE, $cm->id);
@@ -42,6 +35,14 @@
         $user = $USER;
     }
 
+    if (groupmode($course, $cm)
+                and !forum_is_subscribed($user->id, $forum->id)
+                and !has_capability('moodle/site:accessallgroups', $context)) {
+        if (!mygroupid($course->id)) {
+            error('Sorry, but you must be a group member to subscribe.');
+        }
+    }
+
     require_login($course->id, false, $cm);
 
     if (isguest()) {   // Guests can't subscribe