MDL-8906 - Blocks Editting Broken on Admin Search Results page, so disable

edit button, merged from MOODLE_18_STABLE

diff --git a/admin/pagelib.php b/admin/pagelib.php
index cb02dcf8e0a8d8f254b7ee305627ffd6af7af4ec..ac87f0d1dd542d7afaaa8be238fa920ffc5e61ff 100644 (file)
--- a/admin/pagelib.php
+++ b/admin/pagelib.php
@@ -116,7 +116,8 @@ class page_admin extends page_base {
         $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
                                     // if not, print_header() has to be called with a $section parameter
 
-        if ($this->user_allowed_editing()) {
+       // The search page currently doesn't handle block editing 
+        if ($this->section != 'search' and $this->user_allowed_editing()) {
             $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
                        '<div><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                        '<input type="hidden" name="section" value="'.$this->section.'" />'.