Merge "Bug 1540534: Apply the moderation setting from view to its artefacts"

htdocs/artefact/artefact.php

@@ -151,7 +151,10 @@ EOF;
 $javascript = array('paginator', 'viewmenu');
 
 if ($artefact->get('allowcomments') && ( $USER->is_logged_in() || (!$USER->is_logged_in() && get_config('anonymouscomments')))) {
-    $addfeedbackform = pieform(ArtefactTypeComment::add_comment_form(false, $artefact->get('approvecomments')));
+    $commenttype = $view->user_comments_allowed($USER);
+    $moderate = isset($commenttype) && $commenttype === 'private';
+
+    $addfeedbackform = pieform(ArtefactTypeComment::add_comment_form(false, $moderate));
 }
 $objectionform = pieform(objection_form());
 if ($notrudeform = notrude_form()) {