From: mudrd8mz <mudrd8mz>
Date: Mon, 7 Sep 2009 14:45:20 +0000 (+0000)
Subject: NOBUG: better handling of {module}_pluginfile() return values
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=520199ea02db66e366bbd05df808735c4e058aa7;p=moodle.git

NOBUG: better handling of {module}_pluginfile() return values

{module}_pluginfile() should either send the file or
send_file_not_found() or print an error and terminate or whatever, it
should never return to the caller
---

diff --git a/pluginfile.php b/pluginfile.php
index 1585040e6e..c5377b9265 100644
--- a/pluginfile.php
+++ b/pluginfile.php
@@ -281,9 +281,11 @@ if ($context->contextlevel == CONTEXT_SYSTEM) {
 
     $filefunction = $modname.'_pluginfile';
     if (function_exists($filefunction)) {
-        if ($filefunction($course, $cminfo, $context, $filearea, $args, $forcedownload) !== false) {
-            die;
+        // if the function exists, it must send the file and terminate. Whatever it returns leads to "not found"
+        $filefunction($course, $cminfo, $context, $filearea, $args, $forcedownload);
         }
+
+    send_file_not_found();
     }
 
 } else if ($context->contextlevel == CONTEXT_BLOCK) {