Merge branch 'MDL-51179-28' of git://github.com/damyon/moodle into MOODLE_28_STABLE

Conflicts: lib/upgrade.txt
2015-09-03 10:38:36 +02:00
parent 0b9cf14980 42e3e29791
commit 684e59ea5f
16 changed files with 277 additions and 25 deletions
@@ -82,6 +82,7 @@ abstract class qbehaviour_renderer extends plugin_renderer_base {

        $commenttext = format_text($commenttext, $commentformat, array('para' => false));

+        $editor->set_text($commenttext);
        $editor->use_editor($id, array('context' => $options->context));

        $commenteditor = html_writer::tag('div', html_writer::tag('textarea', s($commenttext),