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

behatnotneeded Change-Id: I0ad0e632dbb3a2cf26cda321d0ec0a550b579d02

Bug 1826795: block content in group/institution pages should always be displayed
behatnotneeded Change-Id: I0ad0e632dbb3a2cf26cda321d0ec0a550b579d02
59cf4d24 · Cecilia Vela Gurovic · d87804ec · 59cf4d24
Commit 59cf4d24 authored Apr 29, 2019 by Cecilia Vela Gurovic
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

htdocs/blocktype/lib.php htdocs/blocktype/lib.php +2 -1

No files found.
--- a/htdocs/blocktype/lib.php
+++ b/htdocs/blocktype/lib.php
@@ -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) {