mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

MDL-47371 mod_book: Don't double escape book titles

Browse Source
This commit is contained in:
Cameron Ball 2016-07-05 17:58:13 +08:00
parent a530cb93f5
commit a9ebd43b27
No known key found for this signature in database
GPG Key ID: 305B7F70214D810C
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod/book/locallib.php
View File

@ -223,8 +223,10 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
$i = 0;
foreach ($chapters as $ch) {
$i++;
$title = trim(format_string($ch->title, true, array('context'=>$context)));
$title = trim(format_string($ch->title, true, array('context' => $context)));
$titleunescaped = trim(format_string($ch->title, true, array('context' => $context, 'escape' => false)));
$titleout = $title;
if (!$ch->subchapter) {
if ($first) {
@ -280,34 +282,34 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
$toc .= html_writer::tag('strong', $titleout);
} else {
$toc .= html_writer::link(new moodle_url('view.php', array('id' => $cm->id, 'chapterid' => $ch->id)), $titleout,
array('title' => $title));
array('title' => $titleunescaped));
}
$toc .= html_writer::start_tag('div', array('class' => 'action-list'));
if ($i != 1) {
$toc .= html_writer::link(new moodle_url('move.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'up' => '1', 'sesskey' => $USER->sesskey)),
$OUTPUT->pix_icon('t/up', get_string('movechapterup', 'mod_book', $title)),
array('title' => get_string('movechapterup', 'mod_book', $title)));
array('title' => get_string('movechapterup', 'mod_book', $titleunescaped)));
}
if ($i != count($chapters)) {
$toc .= html_writer::link(new moodle_url('move.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'up' => '0', 'sesskey' => $USER->sesskey)),
$OUTPUT->pix_icon('t/down', get_string('movechapterdown', 'mod_book', $title)),
array('title' => get_string('movechapterdown', 'mod_book', $title)));
array('title' => get_string('movechapterdown', 'mod_book', $titleunescaped)));
}
$toc .= html_writer::link(new moodle_url('edit.php', array('cmid' => $cm->id, 'id' => $ch->id)),
$OUTPUT->pix_icon('t/edit', get_string('editchapter', 'mod_book', $title)),
array('title' => get_string('editchapter', 'mod_book', $title)));
array('title' => get_string('editchapter', 'mod_book', $titleunescaped)));
$toc .= html_writer::link(new moodle_url('delete.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'sesskey' => $USER->sesskey)),
$OUTPUT->pix_icon('t/delete', get_string('deletechapter', 'mod_book', $title)),
array('title' => get_string('deletechapter', 'mod_book', $title)));
array('title' => get_string('deletechapter', 'mod_book', $titleunescaped)));
if ($ch->hidden) {
$toc .= html_writer::link(new moodle_url('show.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'sesskey' => $USER->sesskey)),
$OUTPUT->pix_icon('t/show', get_string('showchapter', 'mod_book', $title)),
array('title' => get_string('showchapter', 'mod_book', $title)));
array('title' => get_string('showchapter', 'mod_book', $titleunescaped)));
} else {
$toc .= html_writer::link(new moodle_url('show.php', array('id' => $cm->id, 'chapterid' => $ch->id, 'sesskey' => $USER->sesskey)),
$OUTPUT->pix_icon('t/hide', get_string('hidechapter', 'mod_book', $title)),
array('title' => get_string('hidechapter', 'mod_book', $title)));
array('title' => get_string('hidechapter', 'mod_book', $titleunescaped)));
}
$toc .= html_writer::link(new moodle_url('edit.php', array('cmid' => $cm->id, 'pagenum' => $ch->pagenum, 'subchapter' => $ch->subchapter)),
$OUTPUT->pix_icon('add', get_string('addafter', 'mod_book'), 'mod_book'), array('title' => get_string('addafter', 'mod_book')));
@ -363,7 +365,9 @@ function book_get_toc($chapters, $chapter, $book, $cm, $edit) {
if ($ch->id == $chapter->id) {
$toc .= html_writer::tag('strong', $title);
} else {
$toc .= html_writer::link(new moodle_url('view.php', array('id' => $cm->id, 'chapterid' => $ch->id)), $title, array('title' => s($title)));
$toc .= html_writer::link(new moodle_url('view.php',
array('id' => $cm->id, 'chapterid' => $ch->id)),
$title, array('title' => s($titleunescaped)));
}
if (!$ch->subchapter) {