From 7a77493ba5fa4ed658b0401e0f81d294b9531ca5 Mon Sep 17 00:00:00 2001 From: Ilya Tregubov Date: Tue, 12 Jan 2021 11:21:30 +0200 Subject: [PATCH] MDL-70528 h5pactivity: Fix block can't be added to h5pactivity page. --- blocks/classes/external/fetch_addable_blocks.php | 2 +- mod/h5pactivity/lib.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blocks/classes/external/fetch_addable_blocks.php b/blocks/classes/external/fetch_addable_blocks.php index 3e14ae55eab..843ab87e5f7 100644 --- a/blocks/classes/external/fetch_addable_blocks.php +++ b/blocks/classes/external/fetch_addable_blocks.php @@ -53,7 +53,7 @@ class fetch_addable_blocks extends external_api { return new external_function_parameters( [ 'pagecontextid' => new external_value(PARAM_INT, 'The context ID of the page.'), - 'pagetype' => new external_value(PARAM_ALPHAEXT, 'The type of the page.'), + 'pagetype' => new external_value(PARAM_ALPHANUMEXT, 'The type of the page.'), 'pagelayout' => new external_value(PARAM_ALPHA, 'The layout of the page.') ] ); diff --git a/mod/h5pactivity/lib.php b/mod/h5pactivity/lib.php index 1b66fafb823..4d8acbf8206 100644 --- a/mod/h5pactivity/lib.php +++ b/mod/h5pactivity/lib.php @@ -314,11 +314,11 @@ function h5pactivity_reset_gradebook(int $courseid, string $type=''): void { * Return a list of page types * * @param string $pagetype current page type - * @param stdClass $parentcontext Block's parent context + * @param stdClass|null $parentcontext Block's parent context * @param stdClass $currentcontext Current context of block * @return array array of page types and it's names */ -function h5pactivity_page_type_list(string $pagetype, stdClass $parentcontext, stdClass $currentcontext): array { +function h5pactivity_page_type_list(string $pagetype, ?stdClass $parentcontext, stdClass $currentcontext): array { $modulepagetype = [ 'mod-h5pactivity-*' => get_string('page-mod-h5pactivity-x', 'h5pactivity'), ]; -- 2.43.0