L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-87017-405-frontpage-block-any-page' of https://github.com/danowar2k/moodle into MOODLE_405_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-11-25 10:42:22 +07:00
parent 209aba758e cd23b1d465
commit c86e79b0b7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/blocklib.php
+2 -2
View File
@@ -1469,7 +1469,7 @@ class block_manager {
if ($parentcontext->id != $systemcontext->id && is_inside_frontpage($parentcontext)) {
$messagestring->pagetype = get_string('showonfrontpageandsubs', 'block');
} else {
$pagetypes = generate_page_type_patterns($this->page->pagetype, $parentcontext);
$pagetypes = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context);
$messagestring->pagetype = $block->instance->pagetypepattern;
if (isset($pagetypes[$block->instance->pagetypepattern])) {
$messagestring->pagetype = $pagetypes[$block->instance->pagetypepattern];
@@ -1686,7 +1686,7 @@ class block_manager {
if ($parentcontext->id != $systemcontext->id && is_inside_frontpage($parentcontext)) {
$messagestring->pagetype = get_string('showonfrontpageandsubs', 'block');
} else {
$pagetypes = generate_page_type_patterns($this->page->pagetype, $parentcontext);
$pagetypes = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context);
$messagestring->pagetype = $block->instance->pagetypepattern;
if (isset($pagetypes[$block->instance->pagetypepattern])) {
$messagestring->pagetype = $pagetypes[$block->instance->pagetypepattern];
lib/questionlib.php
+1 -1
View File
@@ -1946,7 +1946,7 @@ function question_page_type_list($pagetype, $parentcontext, $currentcontext): ar
'question-export' => get_string('page-question-export', 'question'),
'question-import' => get_string('page-question-import', 'question')
];
if ($currentcontext->contextlevel == CONTEXT_COURSE) {
if ($currentcontext && $currentcontext->contextlevel == CONTEXT_COURSE) {
require_once($CFG->dirroot . '/course/lib.php');
return array_merge(course_page_type_list($pagetype, $parentcontext, $currentcontext), $types);
} else {