MDL-10573 - moodle/block:view wasn't working with switch roles or block_list class

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 49d369cd8ac36079f69d1e99cc4c8d5c1c69943f..fbac19c462ffde1b1b7f03b6c100396312b4e694 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -689,6 +689,13 @@ class block_list extends block_base {
     var $content_type  = BLOCK_TYPE_LIST;
 
     function is_empty() {
+
+        $context = get_context_instance(CONTEXT_BLOCK, $this->instance->id);
+        
+        if ( !has_capability('moodle/block:view', $context) ) {
+            return true;
+        }
+
         $this->get_content();
         return (empty($this->content->items) && empty($this->content->footer));
     }

diff --git a/lib/db/access.php b/lib/db/access.php
index 21511dbaf1fb04f06ed4c603bd0c5f0b39dbf473..93bb8db45d43192a8b2a5eff5a5067ec90120a1c 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -1153,7 +1153,11 @@ $moodle_capabilities = array(
         'contextlevel' => CONTEXT_BLOCK,
         'legacy' => array(
             'guest' => CAP_ALLOW,
-            'user' => CAP_ALLOW
+            'user' => CAP_ALLOW,
+            'student' => CAP_ALLOW,
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'coursecreator' => CAP_ALLOW
         )
     )
 );