Merge branch 'MDL-56621-master-fix' of http://github.com/damyon/moodle

2016-11-02 09:03:05 +00:00
parent 0c6fa2e9a8 b07981e1e1
commit b4b8d4fcc2
1 changed files with 3 additions and 0 deletions
@@ -408,6 +408,9 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element implements templatab
        }
        $context['hasformats'] = count($formats) > 1;
        $context['formats'] = [];
+        if (($format === '' || $format === null) && count($formats)) {
+            $format = key($formats);
+        }
        foreach ($formats as $formatvalue => $formattext) {
            $context['formats'][] = ['value' => $formatvalue, 'text' => $formattext, 'selected' => ($formatvalue == $format)];
        }