MDL-15941 block view permissions override regression fixed

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 68ad34da72cd526d4e9c3ca303d91fc55be582c8..0fe65dcd67be646aa37e7795fa7557df6962be46 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -796,7 +796,7 @@ class block_base {
     }
 
     function get_extra_capabilities() {
-        return array();
+        return array('moodle/block:view');
     }
 }
 

diff --git a/lib/accesslib.php b/lib/accesslib.php
index bb37b32706cc760cf38e9251432ffef89efd9d95..23897aa975feaa35f291c60d066ebb9b7196acd2 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -3365,8 +3365,8 @@ function fetch_context_capabilities($context) {
 
             $SQL = "SELECT *
                       FROM {capabilities}
-                     WHERE contextlevel = ".CONTEXT_MODULE."
-                           AND component = :component
+                     WHERE (contextlevel = ".CONTEXT_MODULE."
+                           AND component = :component)
                            $extra";
             $params['component'] = "mod/$module->name";
         break;