aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-11 11:09:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-11 11:09:45 +0000
commit4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf (patch)
treec2c98e5c550b9a9e3b19a0e9d6332437b453da26 /phpBB/install
parentcda9e5e9ec0dfe9c3e0a04809ffc5d0099020046 (diff)
downloadforums-4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf.tar
forums-4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf.tar.gz
forums-4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf.tar.bz2
forums-4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf.tar.xz
forums-4d9b106db2ccc6e15b4afd3fc2e69cf37fae81cf.zip
New search option: Maximum number of words allowed to search for.
(the more words the more database load) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9438 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php5
-rw-r--r--phpBB/install/schemas/schema_data.sql1
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 18a1162c41..e164e5442c 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -11,7 +11,7 @@
$updates_to_version = '3.0.5-dev';
// Enter any version to update from to test updates. The version within the db will not be updated.
-$debug_from_version = '3.0.4';
+$debug_from_version = false;
// Return if we "just include it" to find out for which version the database update is responsible for
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -896,6 +896,9 @@ function change_database_data(&$no_updates, $version)
set_config('confirm_refresh', 1);
+ // Maximum number of keywords
+ set_config('max_num_search_keywords', 10);
+
// Hash old MD5 passwords
$sql = 'SELECT user_id, user_password
FROM ' . USERS_TABLE . '
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index dd187d6958..f5e7b2a4c1 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -160,6 +160,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize', '26
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize_pm', '262144');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars', '20');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_num_search_keywords', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars', '30');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '60000');