L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-01-27 00:56:51 +01:00
parent 65d2f8e3f9 b3d7eb6ed4
commit 0e134b76b5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+5 -2
View File
@@ -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')) {