1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 17:54:39 +02:00

Merge changes made in revisions #r9405 to #r9467

2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-04-18 15:09:19 +00:00
parent e3d98fe77b
commit 1042152a55
61 changed files with 376 additions and 154 deletions

View File

@@ -206,6 +206,7 @@ $schema_data[] = array(
array('max_filesize_pm', '262144'),
array('max_login_attempts', '3'),
array('max_name_chars', '20'),
array('max_num_search_keywords', '10'),
array('max_pass_chars', '30'),
array('max_poll_options', '10'),
array('max_poll_chars', '60000'),
@@ -268,7 +269,7 @@ $schema_data[] = array(
array('tpl_allow_php', '0'),
array('upload_icons_path', 'images/upload_icons'),
array('upload_path', 'files'),
array('version', '3.1.0'),
array('version', '3.1.0-dev1'),
array('warnings_expire_days', '90'),
array('warnings_gc', '14400'),
),