diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 0c3d1fca1..37d691ced 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -67,14 +67,6 @@ class Options extends CI_Controller { $this->session->set_flashdata('success', __("Options saved")); } - // Update theme choice within the options system - $search_update_status = $this->optionslib->update('global_search', $this->input->post('globalSearch')); - - // If theme update is complete set a flashsession with a success note - if($search_update_status == TRUE) { - $this->session->set_flashdata('success', __("Options saved")); - } - // Update logbook map within the options system $logbook_map_update_status = $this->optionslib->update('logbook_map', $this->input->post('logbookMap'), 'yes'); diff --git a/application/controllers/Search.php b/application/controllers/Search.php index 7927f98d1..95e0ec550 100644 --- a/application/controllers/Search.php +++ b/application/controllers/Search.php @@ -7,10 +7,8 @@ class Search extends CI_Controller { parent::__construct(); $this->load->helper(array('form', 'url')); - if($this->optionslib->get_option('global_search') != "true") { - $this->load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } - } + $this->load->model('user_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } } public function index() { diff --git a/application/views/options/appearance.php b/application/views/options/appearance.php index e65ab65cc..c73976163 100644 --- a/application/views/options/appearance.php +++ b/application/views/options/appearance.php @@ -51,12 +51,6 @@ = __("Global Theme Choice, this is used when users arent logged in."); ?> - - -