From 680a65a0ccc573830110f10f3490946b2923550c Mon Sep 17 00:00:00 2001 From: tjhunt Date: Tue, 28 Jul 2009 04:16:59 +0000 Subject: [PATCH] course MDL-19794: Fix more initialisation order problems --- course/category.php | 7 +------ course/search.php | 14 +++++++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/course/category.php b/course/category.php index 3b49668a312..606654e7b54 100644 --- a/course/category.php +++ b/course/category.php @@ -440,10 +440,5 @@ print_course_search(); - if ($editingon && update_category_button()) { - admin_externalpage_print_footer(); - } else { - print_footer(); - } + print_footer(); -?> diff --git a/course/search.php b/course/search.php index 76f14a0dfc3..3089a06bf29 100644 --- a/course/search.php +++ b/course/search.php @@ -29,11 +29,23 @@ $site = get_site(); + $urlparams = array(); + foreach (array('search', 'page', 'blocklist', 'modulelist') as $param) { + if (!empty($$param)) { + $urlparams[$param] = $$param; + } + } + if ($perpage != 10) { + $urlparams['perpage'] = $perpage; + } + $PAGE->set_url('course/search.php', $urlparams); + $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); + if ($CFG->forcelogin) { require_login(); } - if (update_category_button()) { + if (can_edit_in_category()) { if ($edit !== -1) { $USER->editing = $edit; }