From 7c7757185abe162667b79e9adb10b5a0aeecd433 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 3 Mar 2016 12:28:52 +0800
Subject: [PATCH] MDL-53247 search: allow search to be configured before
 enabled

The seach manager no longer checks if search is enabled before providing
an instance. It's up to the callers to do the access control.
---
 report/search/index.php             | 2 --
 search/classes/manager.php          | 8 --------
 search/engine/solr/setup_schema.php | 8 --------
 3 files changed, 18 deletions(-)

diff --git a/report/search/index.php b/report/search/index.php
index 5da3d20314d..64b435c1cf9 100644
--- a/report/search/index.php
+++ b/report/search/index.php
@@ -37,8 +37,6 @@ echo $OUTPUT->heading($pagetitle);
 if (\core_search\manager::is_global_search_enabled() === false) {
     $renderer = $PAGE->get_renderer('core_search');
     echo $renderer->render_search_disabled();
-    echo $OUTPUT->footer();
-    exit;
 }
 
 $renderer = $PAGE->get_renderer('report_search');
diff --git a/search/classes/manager.php b/search/classes/manager.php
index 3f8f7da5786..da68eb1fb8d 100644
--- a/search/classes/manager.php
+++ b/search/classes/manager.php
@@ -99,10 +99,6 @@ class manager {
     /**
      * Returns an initialised \core_search instance.
      *
-     * It requires global search to be enabled. Use \core_search\manager::is_global_search_enabled
-     * to verify it is enabled.
-     *
-     * @throws \moodle_exception
      * @throws \core_search\engine_exception
      * @return \core_search\manager
      */
@@ -114,10 +110,6 @@ class manager {
             return static::$instance;
         }
 
-        if (!static::is_global_search_enabled()) {
-            throw new \moodle_exception('globalsearchdisabled', 'search');
-        }
-
         if (!$engine = static::search_engine_instance()) {
             throw new \core_search\engine_exception('enginenotfound', 'search', '', $CFG->searchengine);
         }
diff --git a/search/engine/solr/setup_schema.php b/search/engine/solr/setup_schema.php
index 5ed2872f627..4ea17e218e3 100644
--- a/search/engine/solr/setup_schema.php
+++ b/search/engine/solr/setup_schema.php
@@ -34,14 +34,6 @@ require_once($CFG->libdir.'/adminlib.php');
 require_login(null, false);
 require_capability('moodle/site:config', context_system::instance());
 
-if (!\core_search\manager::is_global_search_enabled()) {
-    throw new moodle_exception('globalsearchdisabled', 'search');
-}
-
-if ($CFG->searchengine !== 'solr') {
-    throw new moodle_exception('solrnotselected', 'search_solr');
-}
-
 $schema = new \search_solr\schema();
 $schema->setup();