MDL-12752 making unsupported pages truly hidden; merged from MOODLE_19_STABLE

diff --git a/admin/settings/unsupported.php b/admin/settings/unsupported.php
index 5c037ab66f3381bb8f785b153d432ce53bbb564d..9d095b3bda99bab6d2c4bec486207e1e182b5254 100644 (file)
--- a/admin/settings/unsupported.php
+++ b/admin/settings/unsupported.php
@@ -4,10 +4,10 @@
 
 if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
-    $ADMIN->add('unsupported', new admin_externalpage('purgemoodledata', 'Purge moodledata', $CFG->wwwroot.'/'.$CFG->admin.'/delete.php'));
-    $ADMIN->add('unsupported', new admin_externalpage('healthcenter', get_string('healthcenter'), $CFG->wwwroot.'/'.$CFG->admin.'/health.php'));
-    $ADMIN->add('unsupported', new admin_externalpage('toinodb', 'Convert to InnoDB', $CFG->wwwroot.'/'.$CFG->admin.'/innodb.php'));
-    $ADMIN->add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php'));
+    $ADMIN->add('unsupported', new admin_externalpage('purgemoodledata', 'Purge moodledata', $CFG->wwwroot.'/'.$CFG->admin.'/delete.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('healthcenter', get_string('healthcenter'), $CFG->wwwroot.'/'.$CFG->admin.'/health.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('toinodb', 'Convert to InnoDB', $CFG->wwwroot.'/'.$CFG->admin.'/innodb.php', 'moodle/site:config', true));
+    $ADMIN->add('unsupported', new admin_externalpage('replace', 'Search and replace', $CFG->wwwroot.'/'.$CFG->admin.'/replace.php', 'moodle/site:config', true));
 
 } // end of speedup
 

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 5c2bfd920ca9088d809ebc20f58946de8580f1a1..dea854e25ad1bfaaf3f4057c0533acc3fa78b6a8 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4181,7 +4181,8 @@ function admin_search_settings_html($query) {
     foreach ($findings as $found) {
         $page     = $found->page;
         $settings = $found->settings;
-        if ($page->hidden) {
+        if ($page->is_hidden()) {
+            // hidden pages are not displayed in search results
             continue;
         }
         if (is_a($page, 'admin_externalpage')) {