MDL-31521 questions: Allow more than one unit with multiplier equal to 1

2017-12-14 22:34:19 +01:00
parent 95b7be7f05
commit e00e36fa4f
1 changed files with 9 additions and 5 deletions
@@ -1054,11 +1054,15 @@ class qtype_calculated extends question_type {
        $comment->outsidelimit = false;
        $comment->answers = array();
        // Find a default unit.
-        if (!empty($questionid) && $unit = $DB->get_record('question_numerical_units',
-                array('question' => $questionid, 'multiplier' => 1.0))) {
-            $unit = $unit->unit;
-        } else {
-            $unit = '';
+        $unit = '';
+        if (!empty($questionid)) {
+            $units = $DB->get_records('question_numerical_units',
+                array('question' => $questionid, 'multiplier' => 1.0),
+                'id ASC', '*', 0, 1);
+            if ($units) {
+                $unit = reset($units);
+                $unit = $unit->unit;
+            }
        }

        $answers = fullclone($answers);