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

Merge branch 'MDL-65388-master' of https://github.com/ryanwyllie/moodle

Browse Source
This commit is contained in:
Adrian Greeve 2019-05-01 16:06:24 +08:00
commit f2e0dab7f7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/book/tool/print/classes/output/print_book_page.php
View File

@ -79,7 +79,8 @@ class print_book_page implements renderable, templatable {
$data->printdialoglink = $output->render_print_book_dialog_link();
$data->booktitle = $OUTPUT->heading(format_string($this->book->name, true,
array('context' => $context)), 1);
$data->bookintro = format_text($this->book->intro, $this->book->introformat,
$introtext = file_rewrite_pluginfile_urls($this->book->intro, 'pluginfile.php', $context->id, 'mod_book', 'intro', null);
$data->bookintro = format_text($introtext, $this->book->introformat,
array('noclean' => true, 'context' => $context));
$data->sitelink = \html_writer::link(new moodle_url($CFG->wwwroot),
format_string($SITE->fullname, true, array('context' => $context)));

4
mod/book/tool/print/classes/output/renderer.php
View File

@ -200,7 +200,9 @@ class renderer extends plugin_renderer_base {
}
}
$bookchapter .= format_text($chapter->content, $chapter->contentformat, array('noclean' => true, 'context' => $context));
$chaptertext = file_rewrite_pluginfile_urls($chapter->content, 'pluginfile.php', $context->id,
'mod_book', 'chapter', $chapter->id);
$bookchapter .= format_text($chaptertext, $chapter->contentformat, array('noclean' => true, 'context' => $context));
$bookchapter .= html_writer::end_div();
return array($bookchapter, $chaptervisible);