Commit 59cf4d24 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic

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

behatnotneeded

Change-Id: I0ad0e632dbb3a2cf26cda321d0ec0a550b579d02
parent d87804ec
...@@ -1179,7 +1179,8 @@ class BlockInstance { ...@@ -1179,7 +1179,8 @@ class BlockInstance {
$classname = generate_class_name('blocktype', $this->get('blocktype')); $classname = generate_class_name('blocktype', $this->get('blocktype'));
$displayforrole = call_static_method($classname, 'display_for_roles', $user_roles); $displayforrole = call_static_method($classname, 'display_for_roles', $user_roles);
$checkview = $this->get_view(); $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; $displayforrole = true;
} }
if (!$displayforrole) { if (!$displayforrole) {
......
Markdown is supported
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