diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-09 22:24:46 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-09 22:24:46 +0200 |
| commit | caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4 (patch) | |
| tree | d29bdf96e90e4c297f23da18b1979dd6ded97d62 | |
| parent | a1a1b61ae8507276f7191be84a8782c0b0218f9c (diff) | |
| download | forums-caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4.tar forums-caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4.tar.gz forums-caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4.tar.bz2 forums-caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4.tar.xz forums-caeadf85d00ce90b8ea141bcb9a05d229ff1b5b4.zip | |
[ticket/10637] Leftovers from implementation of extensions in convertor
Replacing code in convertor that was missed in ticket 10323
PHPBB3-10637
| -rw-r--r-- | phpBB/install/install_convert.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 5a868004ef..db974f9903 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -735,22 +735,20 @@ class install_convert extends module $this->p_master->error(sprintf($user->lang['COULD_NOT_FIND_PATH'], $convert->options['forum_path']), __LINE__, __FILE__); } - $search_type = basename(trim($config['search_type'])); + $search_type = $config['search_type']; // For conversions we are a bit less strict and set to a search backend we know exist... - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) + if (!class_exists($search_type)) { - $search_type = 'fulltext_native'; + $search_type = 'phpbb_search_fulltext_native'; set_config('search_type', $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; $convert->fulltext_search = new $search_type($error); |