mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/10637] Leftovers from implementation of extensions in convertor

Browse Source 
Replacing code in convertor that was missed in ticket 10323

PHPBB3-10637
This commit is contained in:
Vjacheslav Trushkin
2012-02-09 22:24:46 +02:00
parent a1a1b61ae8
commit caeadf85d0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/install_convert.php
View File

@@ -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);