Merge branch 'MDL-67049' of https://github.com/stronk7/moodle

mpetrowi · Nov 25, 2019 · d35fd6e · d35fd6e
2 parents a5f618d + 8e98f82
commit d35fd6e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/grade/grading/form/rubric/lib.php b/grade/grading/form/rubric/lib.php
@@ -386,7 +386,7 @@ public static function get_default_options() {
     public function get_options() {
         $options = self::get_default_options();
         if (!empty($this->definition->options)) {
-            $thisoptions = json_decode($this->definition->options);
+            $thisoptions = json_decode($this->definition->options, true); // Assoc. array is expected.
             foreach ($thisoptions as $option => $value) {
                 $options[$option] = $value;
             }