Merge branch 'MDL-62771-35_move_plag_disclosure' of https://github.co…

…m/jmcgettrick/moodle into MOODLE_35_STABLE
moodle · Jul 25, 2018 · bdf7f76 · bdf7f76
2 parents b424570 + 2daceaf
commit bdf7f76
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/mod/forum/post.php b/mod/forum/post.php
@@ -1042,14 +1042,15 @@
 } else {
     if (!empty($forum->intro)) {
         echo $OUTPUT->box(format_module_intro('forum', $forum, $cm->id), 'generalbox', 'intro');
-
-        if (!empty($CFG->enableplagiarism)) {
-            require_once($CFG->libdir.'/plagiarismlib.php');
-            echo plagiarism_print_disclosure($cm->id);
-        }
     }
 }
 
+// Call print disclosure for enabled plagiarism plugins.
+if (!empty($CFG->enableplagiarism)) {
+    require_once($CFG->libdir.'/plagiarismlib.php');
+    echo plagiarism_print_disclosure($cm->id);
+}
+
 if (!empty($formheading)) {
     echo $OUTPUT->heading($formheading, 2, array('class' => 'accesshide'));
 }