mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-48946 Files: New custom description format_string call
The format_string call used when getting file type descriptions does not specify a context. The page context is not always available at this point, so for consistency it should specify the system context.
This commit is contained in:
parent
da0ef2e4cf
commit
b3d7eb6ed4
1 changed files with 5 additions and 2 deletions
|
@ -1667,8 +1667,11 @@ function get_mimetype_description($obj, $capitalise=false) {
|
|||
$customdescription = mimeinfo('customdescription', $filename);
|
||||
if ($customdescription) {
|
||||
// Call format_string on the custom description so that multilang
|
||||
// filter can be used (if enabled).
|
||||
$result = format_string($customdescription);
|
||||
// filter can be used (if enabled on system context). We use system
|
||||
// context because it is possible that the page context might not have
|
||||
// been defined yet.
|
||||
$result = format_string($customdescription, true,
|
||||
array('context' => context_system::instance()));
|
||||
} else if (get_string_manager()->string_exists($safemimetype, 'mimetypes')) {
|
||||
$result = get_string($safemimetype, 'mimetypes', (object)$a);
|
||||
} else if (get_string_manager()->string_exists($safemimetypestr, 'mimetypes')) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue