mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

blocks/html MDL-19844 Very minimal fixes to make HTML work. Files still not working properly, see MDL-19844

Browse Source
This commit is contained in:
Martin Dougiamas 2010-04-26 07:56:23 +00:00
parent 9f6e1e71ed
commit 94ee9ae007
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blocks/html/block_html.php
View File

@ -33,8 +33,12 @@ class block_html extends block_base {
}
$this->content = new stdClass;
$this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';
$this->content->footer = '';
if (isset($this->config->text)) {
$this->content->text = format_text($this->config->text['text'], $this->config->text['format'], $filteropt);
} else {
$this->content->text = '';
}
unset($filteropt); // memory footprint

8
blocks/html/edit_form.php
View File

@ -37,8 +37,10 @@ class block_html_edit_form extends block_edit_form {
$mform->addElement('text', 'config_title', get_string('configtitle', 'block_html'));
$mform->setType('config_title', PARAM_MULTILANG);
// TODO MDL-19844 should use the new editor field type.
$mform->addElement('htmleditor', 'config_text', get_string('configcontent', 'block_html'));
// TODO MDL-19844 still needs to be fixed to support files properly
$editoroptions = array('maxfiles' => EDITOR_UNLIMITED_FILES, 'trusttext'=>true, 'context'=>$this->block->context);
$mform->addElement('editor', 'config_text', get_string('configcontent', 'block_html'), null, $editoroptions);
$mform->setType('config_text', PARAM_RAW); // no XSS prevention here, users must be trusted
}
}
}