From ac210d84cc1a289a950d47c1194f1f0ad8f1d4db Mon Sep 17 00:00:00 2001 From: Bart van Bragt Date: Mon, 6 Jan 2003 09:18:35 +0000 Subject: [PATCH] Some minor issues for 2.0.4 release git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3259 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_search.php | 4 ++-- phpBB/install/update_to_204.php | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_search.php b/phpBB/includes/functions_search.php index 07b9ec9e3e..900dc9f6bd 100644 --- a/phpBB/includes/functions_search.php +++ b/phpBB/includes/functions_search.php @@ -326,7 +326,7 @@ function remove_common($mode, $fraction, $word_id_list = array()) } } - return $word_count; + return; } function remove_search_post($post_id_sql) @@ -486,4 +486,4 @@ function username_search($search_match) return; } -?> \ No newline at end of file +?> diff --git a/phpBB/install/update_to_204.php b/phpBB/install/update_to_204.php index d3cfc89f30..5164d33aa1 100644 --- a/phpBB/install/update_to_204.php +++ b/phpBB/install/update_to_204.php @@ -45,12 +45,17 @@ define('IN_PHPBB', 1); $phpbb_root_path = './../'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'config.'.$phpEx); +if(!isset($dbms)) +{ + die("Please read: INSTALL.html before attempting to update."); +} include($phpbb_root_path . 'includes/constants.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include($phpbb_root_path . 'includes/functions_search.'.$phpEx); include($phpbb_root_path . 'includes/db.'.$phpEx); + // // // @@ -885,4 +890,4 @@ echo "\n

You should now visit the General Configuration settings page in the <
- \ No newline at end of file +