From c942cad763899e02b570761db36ef0f271cdf8d7 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Mon, 26 Nov 2018 17:09:17 +0000
Subject: [PATCH] MDL-64465 qtypes: fix incorrect context passed to
 format_string

---
 question/type/calculated/edit_calculated_form.php           | 2 +-
 question/type/calculatedmulti/edit_calculatedmulti_form.php | 2 +-
 question/type/match/renderer.php                            | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php
index 6fdfb67b7b5..cec65e8d17c 100644
--- a/question/type/calculated/edit_calculated_form.php
+++ b/question/type/calculated/edit_calculated_form.php
@@ -136,7 +136,7 @@ class qtype_calculated_edit_form extends qtype_numerical_edit_form {
         if (isset($this->question->id)) {
             $mform->insertElementBefore($mform->createElement('static', 'initialname',
                     get_string('questionstoredname', 'qtype_calculated'),
-                    format_string($this->initialname, true, array('context' => $this->context))), 'name');
+                    format_string($this->initialname)), 'name');
         };
         $addfieldsname = 'updatecategory';
         $addstring = get_string('updatecategory', 'qtype_calculated');
diff --git a/question/type/calculatedmulti/edit_calculatedmulti_form.php b/question/type/calculatedmulti/edit_calculatedmulti_form.php
index db435846d53..bf16bdf377a 100644
--- a/question/type/calculatedmulti/edit_calculatedmulti_form.php
+++ b/question/type/calculatedmulti/edit_calculatedmulti_form.php
@@ -126,7 +126,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form {
         if (isset($this->question->id)) {
             $mform->insertElementBefore($mform->createElement('static', 'initialname',
                     get_string('questionstoredname', 'qtype_calculated'),
-                    format_string($this->initialname, true, array('context' => $this->context))), 'name');
+                    format_string($this->initialname)), 'name');
         };
         $addfieldsname = 'updatecategory';
         $addstring = get_string('updatecategory', 'qtype_calculated');
diff --git a/question/type/match/renderer.php b/question/type/match/renderer.php
index a1094bfc09c..da3e7f79269 100644
--- a/question/type/match/renderer.php
+++ b/question/type/match/renderer.php
@@ -124,8 +124,7 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer {
     protected function format_choices($question) {
         $choices = array();
         foreach ($question->get_choice_order() as $key => $choiceid) {
-            $choices[$key] = format_string($question->choices[$choiceid], true,
-                    array('context' => $question->contextid));
+            $choices[$key] = format_string($question->choices[$choiceid]);
         }
         return $choices;
     }