mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-65502 blocks: Correct check for my dashboard page.

Browse Source
This commit is contained in:
Dan Marsden 2019-05-06 14:10:36 +12:00
parent 2018f4ebc1
commit 8e119e4bb3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blocks/moodleblock.class.php
View File

@ -577,17 +577,13 @@ class block_base {
* @return boolean
*/
function user_can_addto($page) {
global $USER;
// List of formats this block supports.
$formats = $this->applicable_formats();
// The blocks in My Moodle are a special case and use a different capability.
if (!empty($USER->id)
&& $page->context->contextlevel == CONTEXT_USER // Page belongs to a user
&& $page->context->instanceid == $USER->id // Page belongs to this user
&& $page->pagetype == 'my-index') { // Ensure we are on the My Moodle page
$mypagetypes = my_page_type_list($page->pagetype); // Get list of possible my page types.
if (array_key_exists($page->pagetype, $mypagetypes)) { // Ensure we are on a page with a my page type.
// If the block cannot be displayed on /my it is ok if the myaddinstance capability is not defined.
// Is 'my' explicitly forbidden?
// If 'all' has not been allowed, has 'my' been explicitly allowed?