Permalink
Browse files

Merge branch 'wip-mdl-30608-m22' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_22_STABLE
  • Loading branch information...
stronk7 committed Jan 9, 2012
2 parents a7e79bf + 7a44fb4 commit efabe26141a510a3aee54981fae25fbc4928dcb3
Showing with 2 additions and 3 deletions.
  1. +2 −3 admin/search.php
View
@@ -8,16 +8,15 @@
$query = trim(optional_param('query', '', PARAM_NOTAGS)); // Search string
$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
-$PAGE->set_course($SITE);
+
+admin_externalpage_setup('search', '', array('query' => $query)); // now hidden page
$adminroot = admin_get_root(); // need all settings here
$adminroot->search = $query; // So we can reference it in search boxes later in this invocation
$statusmsg = '';
$errormsg = '';
$focus = '';
-admin_externalpage_setup('search', '', array('query' => $query)); // now hidden page
-
// now we'll deal with the case that the admin has submitted the form with changed settings
if ($data = data_submitted() and confirm_sesskey()) {
if (admin_write_settings($data)) {

0 comments on commit efabe26

Please sign in to comment.