Merge branch 'MDL-34711_master' of git://github.com/dmonllao/moodle

2012-08-07 02:09:25 +02:00
parent 8b77ab0c10 b53f4d55c8
commit 4ebc74c548
1 changed files with 3 additions and 1 deletions
@@ -4437,7 +4437,9 @@ function forum_add_discussion($discussion, $mform=null, &$message=null, $userid=
    }

    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection)
-    forum_trigger_content_uploaded_event($post, $cm, 'forum_add_discussion');
+    if (!empty($cm->id)) {
+        forum_trigger_content_uploaded_event($post, $cm, 'forum_add_discussion');
+    }

    return $post->discussion;
 }