Merge branch 'w51_MDL-30761_m23_slowmysql' of git://github.com/skodak/moodle

[moodle.git] / lib / accesslib.php

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 8c4ecd1..43fde86 100644 (file)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -6400,10 +6400,6 @@ class context_module extends context {
 
         $extracaps = array_merge($subcaps, $extracaps);
 
-        // All modules allow viewhiddenactivities. This is so you can hide
-        // the module then override to allow specific roles to see it.
-        // The actual check is in course page so not module-specific
-        $extracaps[] = "moodle/course:viewhiddenactivities";
         list($extra, $params) = $DB->get_in_or_equal(
             $extracaps, SQL_PARAMS_NAMED, 'cap0');
         $extra = "OR name $extra";
@@ -6411,7 +6407,7 @@ class context_module extends context {
         $sql = "SELECT *
                   FROM {capabilities}
                  WHERE (contextlevel = ".CONTEXT_MODULE."
-                       AND component = :component)
+                       AND (component = :component OR component = 'moodle'))
                        $extra";
         $params['component'] = "mod_$module->name";