Merge branch 'MDL-40434' of git://github.com/timhunt/moodle

mvaraujo · Jul 9, 2013 · b4a044f · b4a044f
2 parents a9166e8 + 38c3492
commit b4a044f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/question/type/calculatedmulti/question.php b/question/type/calculatedmulti/question.php
@@ -65,7 +65,6 @@ public function calculate_all_expressions() {
         qtype_calculatedmulti_calculate_helper::calculate_all_expressions($this);
     }
 
-
     public function get_num_variants() {
         return $this->datasetloader->get_number_of_items();
     }
@@ -115,6 +114,19 @@ public function apply_attempt_state(question_attempt_step $step) {
     public function calculate_all_expressions() {
         qtype_calculatedmulti_calculate_helper::calculate_all_expressions($this);
     }
+
+    public function get_num_variants() {
+        return $this->datasetloader->get_number_of_items();
+    }
+
+    public function get_variants_selection_seed() {
+        if (!empty($this->synchronised) &&
+                $this->datasetloader->datasets_are_synchronised($this->category)) {
+            return 'category' . $this->category;
+        } else {
+            return parent::get_variants_selection_seed();
+        }
+    }
 }