Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski 2014-12-02 07:50:00 +00:00
commit 2852a9a0aa

View File

@ -85,6 +85,8 @@ class moodle1_mod_feedback_handler extends moodle1_mod_handler {
* data available
*/
public function process_feedback($data) {
global $CFG;
// get the course module id and context id
$instanceid = $data['id'];
$cminfo = $this->get_cminfo($instanceid);
@ -99,6 +101,12 @@ class moodle1_mod_feedback_handler extends moodle1_mod_handler {
$this->fileman->itemid = 0;
$data['intro'] = moodle1_converter::migrate_referenced_files($data['intro'], $this->fileman);
// Convert the introformat if necessary.
if ($CFG->texteditors !== 'textarea') {
$data['intro'] = text_to_html($data['intro'], false, false, true);
$data['introformat'] = FORMAT_HTML;
}
// start writing feedback.xml
$this->open_xml_writer("activities/feedback_{$this->moduleid}/feedback.xml");
$this->xmlwriter->begin_tag('activity', array('id' => $instanceid, 'moduleid' => $this->moduleid,