1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 06:20:46 +02:00

Merge remote-tracking branch 'naderman/feature/extension-manager' into develop

* naderman/feature/extension-manager: (67 commits)
  [feature/extension-manager] Removing now unused acp_search code
  [feature/extension-manager] Split disabling extensions up into steps as well
  [feature/extension-manager] Add documentation on caching in ext finder
  [feature/extension-manager] Reference correct new module basenames in install
  [feature/extension-manager] Rename default methods to core methods on finder.
  [feature/extension-manager] Document what the class loader stores in cache
  [feature/extension-manager] Add docblock to cached paths map in class loader
  [feature/extension-manager] Clear up docs of extension related template changes
  [feature/extension-manager] Use "core files" instead of "global files" in docs
  [feature/extension-manager] Add docblocks to new search backend methods
  [feature/extension-manager] Add docblocks to new methods in functions_module
  [feature/extension-manager] Clarify comment on ext meta class instantiator
  [feature/extension-manager] Add more info on suffixes in extension finder
  [feature/extension-manager] Clarify is_dir parameter description
  [feature/extension-manager] Clarify class finding method docblock
  [feature/extension-manager] Correct default path comment & remove double strlen
  [feature/extension-manager] Fix "disbale" typo in comment
  [feature/extension-manager] Properly remove old ACP language loading code
  [feature/extension-manager] Support extensions in subdirectories of ext/
  [feature/extension-manager] Add prefix to extension meta data / install classes
  ...
This commit is contained in:
Igor Wiedler
2011-11-19 01:20:22 +01:00
74 changed files with 2574 additions and 534 deletions

View File

@@ -2350,16 +2350,11 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
if ($update_search_index && $data['enable_indexing'])
{
// Select the search method and do some additional checks to ensure it can actually be utilised
$search_type = basename($config['search_type']);
if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
{
trigger_error('NO_SUCH_SEARCH_MODULE');
}
$search_type = $config['search_type'];
if (!class_exists($search_type))
{
include("{$phpbb_root_path}includes/search/$search_type.$phpEx");
trigger_error('NO_SUCH_SEARCH_MODULE');
}
$error = false;