mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
merge r10267
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10268 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
43598d7727
commit
0cdf46db0f
3 changed files with 9 additions and 3 deletions
|
@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
|
|||
*/
|
||||
|
||||
// phpBB Version
|
||||
define('PHPBB_VERSION', '3.0.6-RC4');
|
||||
define('PHPBB_VERSION', '3.0.6');
|
||||
|
||||
// QA-related
|
||||
// define('PHPBB_QA', 1);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
$updates_to_version = '3.0.6-RC4';
|
||||
$updates_to_version = '3.0.6';
|
||||
|
||||
// Enter any version to update from to test updates. The version within the db will not be updated.
|
||||
$debug_from_version = false;
|
||||
|
@ -891,6 +891,8 @@ function database_update_info()
|
|||
'3.0.6-RC2' => array(),
|
||||
// No changes from 3.0.6-RC3 to 3.0.6-RC4
|
||||
'3.0.6-RC3' => array(),
|
||||
// No changes from 3.0.6-RC4 to 3.0.6
|
||||
'3.0.6-RC4' => array(),
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -1559,6 +1561,10 @@ function change_database_data(&$no_updates, $version)
|
|||
// No changes from 3.0.6-RC3 to 3.0.6-RC4
|
||||
case '3.0.6-RC3':
|
||||
break;
|
||||
|
||||
// No changes from 3.0.6-RC4 to 3.0.6
|
||||
case '3.0.6-RC3':
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -239,7 +239,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
|
|||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC4');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
|
||||
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue