MDL-15447

Admin search option only shown if user has moodle/site:config capability

Merged from STABLE_19

diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php
index f05bdb937568ab946674277d175c8da4d93d5fe0..53c041cd29920afccbf86d0407f75fd87ba40434 100644 (file)
--- a/blocks/admin_tree/block_admin_tree.php
+++ b/blocks/admin_tree/block_admin_tree.php
@@ -208,12 +208,17 @@ collapseall();
 //]]>
 </script>';
 
-            $this->content->footer = '<div class="adminsearchform">'.
+            // only do search if you have moodle/site:config
+            if (has_capability('moodle/site:config',get_context_instance(CONTEXT_SYSTEM)) ) {
+                $this->content->footer = '<div class="adminsearchform">'.
                                      '<form action="'.$CFG->wwwroot.'/'.$CFG->admin.'/search.php" method="get"><div>'.
                                      '<label for="query" class="accesshide">'.get_string('searchinsettings', 'admin').'</label>'.
                                      '<input type="text" name="query" id="query" size="8" value="'.s($adminroot->search).'" />'.
                                      '<input type="submit" value="'.get_string('search').'" /></div>'.
                                      '</form></div>';
+            } else {
+                $this->content->footer = '';
+            }
         } else {
             $this->content = new object();
             $this->content->text = '';