From 16a7ab982649f58a74f49ea83fe24df6f9eb0444 Mon Sep 17 00:00:00 2001 From: mark-nielsen Date: Tue, 24 Jul 2007 07:04:33 +0000 Subject: [PATCH] Merged in changes for MDL-9923 from MOODLE_18_STABLE --- mod/lesson/mediafile.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php index 34e8491c04d..fc52550fb25 100644 --- a/mod/lesson/mediafile.php +++ b/mod/lesson/mediafile.php @@ -30,7 +30,12 @@ error('Course module is incorrect'); } - if (!is_url($lesson->mediafile)) { + require_login($course->id, false, $cm); + + // Get the mimetype + $mimetype = mimeinfo("type", $lesson->mediafile); + + if (!is_url($lesson->mediafile) and !in_array($mimetype, array('text/plain', 'text/html'))) { print_header($course->shortname); } @@ -49,8 +54,6 @@ exit(); } - require_login($course->id, false, $cm); - if (is_url($lesson->mediafile)) { $fullurl = $lesson->mediafile; } else { @@ -62,9 +65,6 @@ } $fullurl = "$CFG->wwwroot$relativeurl"; } - - // Get the mimetype - $mimetype = mimeinfo("type", $lesson->mediafile); // find the correct type and print it out if ($mimetype == "audio/mp3") { // It's an MP3 audio file