Merge branch 'MDL-72321_master-squashed' of https://github.com/marxjo…

…hnson/moodle

backup/moodle2/restore_stepslib.php

@@ -6218,15 +6218,30 @@ public function process_question_set_reference($data) {
         $data = (object) $data;
         $data->usingcontextid = $this->get_mappingid('context', $data->usingcontextid);
         $data->itemid = $this->get_new_parentid('quiz_question_instance');
-        $filtercondition = json_decode($data->filtercondition);
-        if ($category = $this->get_mappingid('question_category', $filtercondition->questioncategoryid)) {
-            $filtercondition->questioncategoryid = $category;
+        $filtercondition = json_decode($data->filtercondition, true);
+
+        if (!isset($filtercondition['filter'])) {
+            // Pre-4.3, convert the old filtercondition format to the new format.
+            $filtercondition = \core_question\question_reference_manager::convert_legacy_set_reference_filter_condition(
+                    $filtercondition);
         }
-        $data->filtercondition = json_encode($filtercondition);
+
+        // Map category id used for category filter condition and corresponding context id.
+        $oldcategoryid = $filtercondition['filter']['category']['values'][0];
+        $newcategoryid = $this->get_mappingid('question_category', $oldcategoryid);
+        $filtercondition['filter']['category']['values'][0] = $newcategoryid;
+
         if ($context = $this->get_mappingid('context', $data->questionscontextid)) {
             $data->questionscontextid = $context;
         }
 
+        $filtercondition['cat'] = implode(',', [
+            $filtercondition['filter']['category']['values'][0],
+            $data->questionscontextid,
+        ]);
+
+        $data->filtercondition = json_encode($filtercondition);
+
         $DB->insert_record('question_set_references', $data);
     }
 }

comment/lib.php

@@ -506,6 +506,9 @@ public function output($return = true) {
 
                 $html .= html_writer::start_tag('div', array('class' => 'comment-area'));
                 $html .= html_writer::start_tag('div', array('class' => 'db'));
+                $html .= html_writer::tag('label',
+                        get_string('comment', 'comment'),
+                        ['for' => 'dlg-content-'.$this->cid, 'class' => 'sr-only']);
                 $html .= html_writer::tag('textarea', '', $textareaattrs);
                 $html .= html_writer::end_tag('div'); // .db
 

lang/en/question.php

@@ -398,6 +398,7 @@
 $string['markedoutofmax'] = 'Marked out of {$a}';
 $string['markoutofmax'] = 'Mark {$a->mark} out of {$a->max}';
 $string['marks'] = 'Marks';
+$string['noconditionspecified'] = 'Please specify a condition';
 $string['noresponse'] = '[No response]';
 $string['notanswered'] = 'Not answered';
 $string['notgraded'] = 'Not graded';
@@ -465,9 +466,9 @@
 $string['rightanswer_help'] = 'An automatically generated summary of the correct response. This can be limited, so you may wish to consider explaining the correct solution in the general feedback for the question, and turning this option off.';
 $string['saved'] = 'Saved: {$a}';
 $string['settingsformultipletries'] = 'Multiple tries';
+$string['showhidden'] = 'Show hidden questions';
 $string['shortversioninfo'] = 'v{$a->version} (of {$a->latestversion})';
 $string['shortversioninfolatest'] = 'v{$a->version} (latest)';
-$string['showhidden'] = 'Also show old questions';
 $string['showmarkandmax'] = 'Show mark and max';
 $string['showmaxmarkonly'] = 'Show max mark only';
 $string['showquestiontext'] = 'Show question text in the question list?';