From 3419329a1267cfcb4fbcfb6b0d602cce4bd02601 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Thu, 17 Nov 2022 22:28:16 +0000 Subject: [PATCH] MDL-74755 block_accessreview: stricter checking of enabled config. --- admin/tool/brickfield/classes/accessibility.php | 7 +------ blocks/accessreview/block_accessreview.php | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/admin/tool/brickfield/classes/accessibility.php b/admin/tool/brickfield/classes/accessibility.php index 35f3510b9e8..de6019c6d96 100644 --- a/admin/tool/brickfield/classes/accessibility.php +++ b/admin/tool/brickfield/classes/accessibility.php @@ -48,12 +48,7 @@ class accessibility { public static function is_accessibility_enabled(): bool { global $CFG; - if (isset($CFG->enableaccessibilitytools)) { - return $CFG->enableaccessibilitytools; - } - - // Enabled by default. - return true; + return !empty($CFG->enableaccessibilitytools); } /** diff --git a/blocks/accessreview/block_accessreview.php b/blocks/accessreview/block_accessreview.php index 1743b06b336..cb71ce0764f 100644 --- a/blocks/accessreview/block_accessreview.php +++ b/blocks/accessreview/block_accessreview.php @@ -171,9 +171,7 @@ class block_accessreview extends block_base { * @return bool */ public function can_block_be_added(moodle_page $page): bool { - global $CFG; - - return $CFG->enableaccessibilitytools; + return accessibility::is_accessibility_enabled(); } /**