Merge branch 'MDL-29987_24' of https://github.com/bostelm/moodle into MOODLE_24_STABLE

This commit is contained in:
Sam Hemelryk
2013-09-16 10:12:51 +12:00
+2 -2
View File
@@ -408,7 +408,7 @@ function resource_print_filenotfound($resource, $cm, $course) {
}
/**
* Decide the best diaply format.
* Decide the best display format.
* @param object $resource
* @return int display type constant
*/
@@ -428,7 +428,7 @@ function resource_get_final_display_type($resource) {
if (file_mimetype_in_typegroup($mimetype, 'archive')) {
return RESOURCELIB_DISPLAY_DOWNLOAD;
}
if (file_mimetype_in_typegroup($mimetype, array('web_image', '.pdf', '.htm', 'web_video', 'web_audio'))) {
if (file_mimetype_in_typegroup($mimetype, array('web_image', '.htm', 'web_video', 'web_audio'))) {
return RESOURCELIB_DISPLAY_EMBED;
}