From: skodak <skodak>
Date: Wed, 6 Aug 2008 05:07:46 +0000 (+0000)
Subject: MDL-15941 block view permissions override regression fixed
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=44df8fa94c814a7e55ce5bce458d08ffc7ae08f1;p=moodle.git

MDL-15941 block view permissions override regression fixed
---

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 68ad34da72..0fe65dcd67 100644
--- 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 bb37b32706..23897aa975 100755
--- 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;