Commit 858a7c2e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1826795: block content in group/institution pages should always be displayed"

parents bc1fb0f2 59cf4d24
......@@ -1179,7 +1179,8 @@ 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()) {
if ($checkview->get('owner') == NULL ||
($USER->is_admin_for_user($checkview->get('owner')) && $checkview->is_objectionable())) {
$displayforrole = true;
}
if (!$displayforrole) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment