diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 0723376f6f..a5a89d62e8 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -85,29 +85,25 @@ class acp_search if ($search->is_available()) { $name = $search->get_name(); - $type = get_class($search); $selected = ($config['search_type'] == $type) ? ' selected="selected"' : ''; $identifier = substr($type, strrpos($type, '\\') + 1); $search_options .= ""; - if (method_exists($search, 'acp')) - { - $vars = $search->acp(); + $vars = $search->get_acp_options(); - if (!$submit) - { - $template->assign_block_vars('backend', array( - 'NAME' => $name, - 'SETTINGS' => $vars['tpl'], - 'IDENTIFIER' => $identifier, - )); - } - else if (is_array($vars['config'])) - { - $settings = array_merge($settings, $vars['config']); - } + if (!$submit) + { + $template->assign_block_vars('backend', array( + 'NAME' => $name, + 'SETTINGS' => $vars['tpl'], + 'IDENTIFIER' => $identifier, + )); + } + else if (is_array($vars['config'])) + { + $settings = array_merge($settings, $vars['config']); } } }