Merge branch 'wip-mdl-32155-m21' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_21_STABLE
moodle · May 23, 2012 · 6645da5 · 6645da5
2 parents 6e4bb45 + 38d13c2
commit 6645da5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pluginfile.php b/pluginfile.php
@@ -732,6 +732,12 @@
             // somebody tries to gain illegal access, cm type must match the component!
             send_file_not_found();
         }
+
+        $bprecord = $DB->get_record('block_positions', array('blockinstanceid' => $context->instanceid), 'visible');
+        // User can't access file, if block is hidden or doesn't have block:view capability
+        if (($bprecord && !$bprecord->visible) || !has_capability('moodle/block:view', $context)) {
+                send_file_not_found();
+        }
     } else {
         $birecord = null;
     }