Merge branch 'MDL-79863-ordering' of https://github.com/Chocolate-lightning/moodle

Author: andrewnicols

lib/plugins.json

@@ -401,6 +401,7 @@
             "multianswer",
             "multichoice",
             "numerical",
+            "ordering",
             "random",
             "randomsamatch",
             "shortanswer",

question/format/gift/format.php

@@ -281,6 +281,9 @@ public function readquestion($lines) {
         // Determine question type.
         $question->qtype = null;
 
+        // Extract any idnumber and tags from the comments.
+        list($question->idnumber, $question->tags) = $this->extract_idnumber_and_tags_from_comment($comments);
+
         // Give plugins first try.
         // Plugins must promise not to intercept standard qtypes
         // MDL-12346, this could be called from lesson mod which has its own base class =(.
@@ -325,10 +328,6 @@ public function readquestion($lines) {
             }
         }
 
-        // Extract any idnumber and tags from the comments.
-        list($question->idnumber, $question->tags) =
-                $this->extract_idnumber_and_tags_from_comment($comments);
-
         if (!isset($question->qtype)) {
             $giftqtypenotset = get_string('giftqtypenotset', 'qformat_gift');
             $this->error($giftqtypenotset, $text);

question/type/edit_question_form.php

@@ -802,8 +802,11 @@ protected function data_preprocessing_combined_feedback($question,
 
     /**
      * Perform the necessary preprocessing for the hint fields.
-     * @param object $question the data being passed to the form.
-     * @return object $question the modified data.
+     *
+     * @param object $question The data being passed to the form.
+     * @param bool $withclearwrong Clear wrong hints.
+     * @param bool $withshownumpartscorrect Show number correct.
+     * @return stdClass The modified data.
      */
     protected function data_preprocessing_hints($question, $withclearwrong = false,
             $withshownumpartscorrect = false) {