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

2019-11-25 09:33:42 +08:00
parent a5f618d6a9 8e98f82f12
commit d35fd6ee1b
1 changed files with 1 additions and 1 deletions
@@ -386,7 +386,7 @@ class gradingform_rubric_controller extends gradingform_controller {
    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;
            }