Merge "bug 1798203: Peer review prevents viewing objectionable content"

htdocs/blocktype/lib.php

@@ -1178,6 +1178,10 @@ class BlockInstance {
 
         $classname = generate_class_name('blocktype', $this->get('blocktype'));
         $displayforrole = call_static_method($classname, 'display_for_roles', $user_roles);
+        $checkview = $this->get_view();
+        if ($USER->is_admin_for_user($checkview->get('owner')) && $checkview->is_objectionable()) {
+            $displayforrole = true;
+        }
         if (!$displayforrole) {
             $content = '';
             $smarty->assign('loadbyajax', false);

htdocs/view/view.php

@@ -333,7 +333,8 @@ if ($owner && $owner == $USER->get('id')) {
 
 // Don't show page content to a user with peer role
 // if the view doesn't have a peer assessment block
-if (!$USER->has_peer_role_only($view) || $view->has_peer_assessement_block()) {
+if (!$USER->has_peer_role_only($view) || $view->has_peer_assessement_block()
+    || ($USER->is_admin_for_user($view->get('owner')) && $view->is_objectionable())) {
     $viewcontent = $view->build_rows(); // Build content before initialising smarty in case pieform elements define headers.
 }