mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-02 14:28:30 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68974 blocks: Check permission before generating content

Browse Source
This commit is contained in:
Andrew Nicols 2020-08-10 10:08:17 +08:00 committed by Jenkins
parent cb72d845f5
commit 5c91f31d2e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/lib.php
View File

@ -1281,6 +1281,9 @@ class calendar_information {
* @param string|null $view preference view options (eg: day, month, upcoming)
*/
public function add_sidecalendar_blocks(core_calendar_renderer $renderer, $showfilters=false, $view=null) {
if (!has_capability('moodle/block:view', $this->context) ) {
return;
}
if ($showfilters) {
$filters = new block_contents();
$filters->content = $renderer->event_filter();

6
lib/blocklib.php
View File

@ -1225,6 +1225,12 @@ class block_manager {
*/
public function ensure_content_created($region, $output) {
$this->ensure_instances_exist($region);
if (!has_capability('moodle/block:view', $this->page->context) ) {
$this->visibleblockcontent[$region] = [];
return;
}
if (!array_key_exists($region, $this->visibleblockcontent)) {
$contents = array();
if (array_key_exists($region, $this->extracontent)) {