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/includes | |
| 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/includes')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 7fdf874456..7b4393f383 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -847,15 +847,13 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = } // Remove the message from the search index - $search_type = basename($config['search_type']); + $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'); } - include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - $error = false; $search = new $search_type($error); diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 10e5956fc2..a21c67924d 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -907,16 +907,11 @@ function mcp_fork_topic($topic_ids) if (!isset($search_type) && $topic_row['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; diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index ee79928eb1..2a52a858b3 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -464,12 +464,10 @@ function change_poster(&$post_info, $userdata) } // refresh search cache of this post - $search_type = basename($config['search_type']); + $search_type = $config['search_type']; - if (file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) + if (class_exists($search_type)) { - require("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - // We do some additional checks in the module to ensure it can actually be utilised $error = false; $search = new $search_type($error); |