From: poltawski <poltawski>
Date: Thu, 15 Mar 2007 00:54:31 +0000 (+0000)
Subject: MDL-8906 - Actually, I'll Fix blocks editing on search pages, by adding the query... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a989172a5c17a2e2680762077ffb2611adc6e8b2;p=moodle.git

MDL-8906 - Actually, I'll Fix blocks editing on search pages, by adding the query - merged from MOODLE_18_STABLE
---

diff --git a/admin/pagelib.php b/admin/pagelib.php
index ac87f0d1dd..b1f45c99ce 100644
--- a/admin/pagelib.php
+++ b/admin/pagelib.php
@@ -117,11 +117,14 @@ class page_admin extends page_base {
                                     // if not, print_header() has to be called with a $section parameter
 
 	// The search page currently doesn't handle block editing 
-        if ($this->section != 'search' and $this->user_allowed_editing()) {
+        if ($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.'" />'.
-                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></div>';
+                       '<input type="hidden" name="section" value="'.$this->section.'" />';
+            if(isset($CFG->adminsearchquery)){
+                $buttons.='<input type="hidden" name="query" value="'.$CFG->adminsearchquery.'" />';
+            }
+            $buttons.='<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></div></form></div>';
         } else {
             $buttons = '&nbsp;';
         }