From 98e019455ecef5a98de07fc11ed3d0f8e932d805 Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Mon, 14 Jan 2019 18:21:41 +1100 Subject: [PATCH] MDL-64551 core_question: Fix double ampersand escaping in tag button --- question/classes/bank/tags_action_column.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/question/classes/bank/tags_action_column.php b/question/classes/bank/tags_action_column.php index 79a7cbca5b7..47446fa66fd 100644 --- a/question/classes/bank/tags_action_column.php +++ b/question/classes/bank/tags_action_column.php @@ -50,14 +50,12 @@ class tags_action_column extends action_column_base { * @param string $rowclasses */ protected function display_content($question, $rowclasses) { - global $DB; - if (\core_tag_tag::is_enabled('core_question', 'question') && question_has_capability_on($question, 'view')) { $cantag = question_has_capability_on($question, 'tag'); $qbank = $this->qbank; - $url = $qbank->edit_question_url($question->id); + $url = new \moodle_url($qbank->edit_question_url($question->id)); $editingcontext = $qbank->get_most_specific_context(); $this->print_tag_icon($question->id, $url, $cantag, $editingcontext->id); @@ -68,11 +66,11 @@ class tags_action_column extends action_column_base { * Build and print the tags icon. * * @param int $id The question ID. - * @param string $url Editing question url. + * @param \moodle_url $url Editing question url. * @param bool $cantag Whether the user can tag questions or not. * @param int $contextid Question category context ID. */ - protected function print_tag_icon($id, $url, $cantag, $contextid) { + protected function print_tag_icon($id, \moodle_url $url, $cantag, $contextid) { global $OUTPUT; $params = [