mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-18910 full support for module intro editor with embedded images
This commit is contained in:
parent
26c9ecb05f
commit
b4950d9649
4 changed files with 4 additions and 22 deletions
|
@ -2482,22 +2482,7 @@ function data_pluginfile($course, $cminfo, $context, $filearea, $args) {
|
|||
return false;
|
||||
}
|
||||
|
||||
if ($filearea === 'data_intro') {
|
||||
// all users may access it
|
||||
$relativepath = '/'.implode('/', $args);
|
||||
$fullpath = $context->id.'data_intro0'.$relativepath;
|
||||
|
||||
$fs = get_file_storage();
|
||||
if (!$file = $fs->get_file_by_hash(sha1($fullpath)) or $file->is_directory()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$lifetime = isset($CFG->filelifetime) ? $CFG->filelifetime : 86400;
|
||||
|
||||
// finally send the file
|
||||
send_stored_file($file, $lifetime, 0);
|
||||
|
||||
} else if ($filearea === 'data_content') {
|
||||
if ($filearea === 'data_content') {
|
||||
$contentid = (int)array_shift($args);
|
||||
|
||||
if (!$content = $DB->get_record('data_content', array('id'=>$contentid))) {
|
||||
|
|
|
@ -19,10 +19,7 @@ class mod_data_mod_form extends moodleform_mod {
|
|||
}
|
||||
$mform->addRule('name', null, 'required', null, 'client');
|
||||
|
||||
$mform->addElement('htmleditor', 'intro', get_string('intro', 'data'));
|
||||
$mform->setType('intro', PARAM_RAW);
|
||||
$mform->addRule('intro', null, 'required', null, 'client');
|
||||
$mform->setHelpButton('intro', array('writing', 'questions', 'richtext2'), false, 'editorhelpbutton');
|
||||
$this->add_intro_editor(true, get_string('intro', 'data'));
|
||||
|
||||
$mform->addElement('date_selector', 'timeavailablefrom', get_string('availablefromdate', 'data'), array('optional'=>true));
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@
|
|||
// First all rss feeds common headers.
|
||||
$header = rss_standard_header($course->shortname.': '.format_string($data->name,true),
|
||||
$CFG->wwwroot."/mod/data/view.php?d=".$data->id,
|
||||
format_string($data->intro,true));
|
||||
format_string($data->intro,true)); //TODO: fix format
|
||||
|
||||
if (!empty($header)) {
|
||||
$articles = rss_add_items($items);
|
||||
|
|
|
@ -316,7 +316,7 @@
|
|||
if ($data->intro and empty($page) and empty($record) and $mode != 'single') {
|
||||
$options = new object();
|
||||
$options->noclean = true;
|
||||
print_box(format_text($data->intro, $data->introformat, $options), 'generalbox', 'intro');
|
||||
print_box(format_module_intro('data', $data, $cm->id), 'generalbox', 'intro');
|
||||
}
|
||||
|
||||
/// Delete any requested records
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue