diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 13:06:58 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-10 13:06:58 -0500 |
| commit | 56ef5d5025597d2d3528b59dc3e92f6f7978801f (patch) | |
| tree | 8350a2dd1a7a7aae22170f726e28e03188ad3792 /phpBB/develop | |
| parent | 9d81f9717519471dbe96de271b657ea4b8fbeda2 (diff) | |
| parent | caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4 (diff) | |
| download | forums-56ef5d5025597d2d3528b59dc3e92f6f7978801f.tar forums-56ef5d5025597d2d3528b59dc3e92f6f7978801f.tar.gz forums-56ef5d5025597d2d3528b59dc3e92f6f7978801f.tar.bz2 forums-56ef5d5025597d2d3528b59dc3e92f6f7978801f.tar.xz forums-56ef5d5025597d2d3528b59dc3e92f6f7978801f.zip | |
Merge remote-tracking branch 'cyberalien/ticket/10637' into develop
* cyberalien/ticket/10637:
[ticket/10637] Leftovers from implementation of extensions in convertor
[ticket/10637] Leftovers from implementation of extensions in develop tools
[ticket/10637] Leftovers from implementation of extensions in mcp_post
[ticket/10637] Leftovers from implementation of extensions in mcp_main
[ticket/10637] Leftovers from implementation of extensions
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_search_index.php | 1 | ||||
| -rw-r--r-- | phpBB/develop/search_fill.php | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/develop/create_search_index.php b/phpBB/develop/create_search_index.php index 28001035f6..1de20f3099 100644 --- a/phpBB/develop/create_search_index.php +++ b/phpBB/develop/create_search_index.php @@ -25,7 +25,6 @@ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'common.' . $phpEx); require($phpbb_root_path . 'includes/acp/acp_search.' . $phpEx); -require($phpbb_root_path . 'includes/search/' . $class_name . '.' . $phpEx); $user->session_begin(); $auth->acl($user->data); diff --git a/phpBB/develop/search_fill.php b/phpBB/develop/search_fill.php index 371c8c74cc..4c0b607778 100644 --- a/phpBB/develop/search_fill.php +++ b/phpBB/develop/search_fill.php @@ -34,13 +34,11 @@ $user->setup(); $search_type = $config['search_type']; -if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) +if (!class_exists($search_type)) { trigger_error('NO_SUCH_SEARCH_MODULE'); } -require($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx); - $error = false; $search = new $search_type($error); |