moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-54926 search: Reduce over-escaping in results

Browse source
This commit is contained in:
Eric Merrill 2016-06-28 16:33:29 -04:00
parent b8474fe0c7
commit 4e2b5191d4
6 changed files with 153 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
search/classes/document.php
View file

@ -555,6 +555,9 @@ class document implements \renderable, \templatable {
* Although content is a required field when setting up the document, it accepts '' (empty) values
* as they may be the result of striping out HTML.
*
* SECURITY NOTE: It is the responsibility of the document to properly escape any text to be displayed.
* The renderer will output the content without any further cleaning.
*
* @param renderer_base $output The renderer.
* @return array
*/
@ -580,13 +583,13 @@ class document implements \renderable, \templatable {
if (count($files) > 1) {
$filenames = array();
foreach ($files as $file) {
$filenames[] = $file->get_filename();
$filenames[] = format_string($file->get_filename(), true, array('context' => $this->get('contextid')));
}
$data['multiplefiles'] = true;
$data['filenames'] = $filenames;
} else {
$file = reset($files);
$data['filename'] = $file->get_filename();
$data['filename'] = format_string($file->get_filename(), true, array('context' => $this->get('contextid')));
}
}