diff options
author | David M <davidmj@users.sourceforge.net> | 2007-04-19 20:59:52 +0000 |
---|---|---|
committer | David M <davidmj@users.sourceforge.net> | 2007-04-19 20:59:52 +0000 |
commit | 1ca1021134311170e1fa0d4baf063ae466e3b7f1 (patch) | |
tree | 3116801791f67f570bcdf7fd4751282611efc27d /phpBB/install | |
parent | 897e0f952d522583ee60efbdf07e7b46ba5fd751 (diff) | |
download | forums-1ca1021134311170e1fa0d4baf063ae466e3b7f1.tar forums-1ca1021134311170e1fa0d4baf063ae466e3b7f1.tar.gz forums-1ca1021134311170e1fa0d4baf063ae466e3b7f1.tar.bz2 forums-1ca1021134311170e1fa0d4baf063ae466e3b7f1.tar.xz forums-1ca1021134311170e1fa0d4baf063ae466e3b7f1.zip |
#9902
git-svn-id: file:///svn/phpbb/trunk@7374 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
-rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5ec0f8ffd2..d7bd1b3782 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1037,6 +1037,10 @@ if (version_compare($current_version, '3.0.b5', '<=')) $db->sql_query($sql); } + $user_char_ary = array('.*' => 'USERNAME_CHARS_ANY', '[a-z]+' => 'USERNAME_ALPHA_ONLY', '[-\]_+ [a-z]+' => 'USERNAME_ALPHA_SPACERS', '\w+' => 'USERNAME_LETTER_NUM', '[-\]_+ [\w]+' => 'USERNAME_LETTER_NUM_SPACERS', '[\x01-\x7F]+' => 'USERNAME_ASCII'); + + set_config('allow_name_chars', $config['allow_name_chars']); + // sorting thang if ($map_dbms === 'mysql_41') { diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 597d37d269..e8f3bc8e07 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -18,7 +18,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks', INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_emailreuse', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars', '.*'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars', 'USERNAME_CHARS_ANY'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0'); |