diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
| commit | dc747b8d994b6f5d07182196ed9deed7959a7317 (patch) | |
| tree | 82796847148a27d822ea17199ee055244fc3028e /phpBB/install/install_convert.php | |
| parent | 202861eec9ca571cfae48002f2e0524986ae69bf (diff) | |
| download | forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.gz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.bz2 forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.xz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.zip | |
- * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]
- display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761]
- forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868]
- magic urls should work after ">"
- fixed sorting in mcp_reports/mcp_queue [Bug #9882]
- display a "Report has already been closed" message, if a post is accessed in mcp_reports which has a closed report (might occur if two moderators want to process it at the same time)
- convertor: old forum path should have the trailing slash removed
- subsilver2 will come bundled with phpBB3, but it will not be installed by default (if admins want to use it they can, but it's not a default option for users)
- prosilver was missing the topic-only mode in mcp_reports/mcp_queue
git-svn-id: file:///svn/phpbb/trunk@7428 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index a2d2078a07..c114b3f219 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -224,6 +224,20 @@ class install_convert extends module $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); unset($dbpasswd); + $sql = 'SELECT config_value + FROM ' . CONFIG_TABLE . ' + WHERE config_name = \'search_type\''; + $result = $db->sql_query($sql); + + if ($db->sql_fetchfield('config_value') != 'fulltext_mysql') + { + $template->assign_vars(array( + 'S_ERROR_BOX' => true, + 'ERROR_TITLE' => $lang['SEARCH_INDEX_UNCONVERTED'], + 'ERROR_MSG' => $lang['SEARCH_INDEX_UNCONVERTED_EXPLAIN'], + )); + } + switch ($db->sql_layer) { case 'sqlite': @@ -387,6 +401,9 @@ class install_convert extends module // -> We should convert old urls to the new relative urls format // $src_url = request_var('src_url', 'Not in use at the moment'); + // strip trailing slash from old forum path + $forum_path = (strlen($forum_path) && $forum_path[strlen($forum_path) - 1] == '/') ? substr($forum_path, 0, -1) : $forum_path; + $error = array(); if ($submit) { |