mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-13 20:24:08 +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:
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
$updates_to_version = '3.1.0';
|
||||
$updates_to_version = '3.1.0-dev1';
|
||||
|
||||
// Enter any version to update from to test updates. The version within the db will not be updated.
|
||||
$debug_from_version = false;
|
||||
@@ -55,8 +55,8 @@ $inline_update = (request_var('type', 0)) ? true : false;
|
||||
// Only an example, but also commented out
|
||||
$database_update_info = array(
|
||||
|
||||
// No changes from 3.0.3-RC1 to 3.0.3
|
||||
'3.0.3-RC1' => array(),
|
||||
// Changes from 3.0.5 to 3.1.0-dev1
|
||||
'3.0.5' => array(),
|
||||
);
|
||||
|
||||
$error_ary = array();
|
||||
@@ -340,6 +340,9 @@ function change_database_data($version)
|
||||
switch ($version)
|
||||
{
|
||||
default:
|
||||
// Changes from 3.0.5 to 3.1.0-dev1
|
||||
case '3.0.5':
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@@ -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'),
|
||||
),
|
||||
|
Reference in New Issue
Block a user