diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-06 01:20:12 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-06 01:20:12 +0100 |
| commit | c4e02a191628b4b9f7b6340f2876607663baeb5a (patch) | |
| tree | 48a820f3d408e84273fb7b01b9b4f646cdbf9d0a /phpBB/install | |
| parent | ca8cc037639619845dbb970529faebb705943e90 (diff) | |
| parent | 2e1cd98a5a9145fb2d86e63bf178d6370c301602 (diff) | |
| download | forums-c4e02a191628b4b9f7b6340f2876607663baeb5a.tar forums-c4e02a191628b4b9f7b6340f2876607663baeb5a.tar.gz forums-c4e02a191628b4b9f7b6340f2876607663baeb5a.tar.bz2 forums-c4e02a191628b4b9f7b6340f2876607663baeb5a.tar.xz forums-c4e02a191628b4b9f7b6340f2876607663baeb5a.zip | |
Merge commit 'release-3.0.7-PL1'
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 1d6b79bbec..dfade990d2 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -32,7 +32,7 @@ unset($dbpasswd); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.0.7', + 'phpbb_version' => '3.0.7-PL1', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, @@ -83,7 +83,7 @@ $tables = array( * 'table_format' => 'file', * 'filename' => 'NAME OF FILE', // If the file is not in the root directory, the path needs to be added with no leading slash * 'array_name' => 'NAME OF ARRAY', // Only used if the configuration file stores the setting in an array. -* 'settings' => array( +* 'settings' => array( * 'board_email' => 'SUPPORT_EMAIL', // target config name => source target name * ) * ); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e82530189c..f39ed60d43 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.7'; +$updates_to_version = '3.0.7-PL1'; // Enter any version to update from to test updates. The version within the db will not be updated. $debug_from_version = false; @@ -911,6 +911,8 @@ function database_update_info() '3.0.7-RC1' => array(), // No changes from 3.0.7-RC2 to 3.0.7 '3.0.7-RC2' => array(), + // No changes from 3.0.7 to 3.0.7-PL1 + '3.0.7' => array(), ); } @@ -1642,6 +1644,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.7-RC2 to 3.0.7 case '3.0.7-RC2': break; + + // No changes from 3.0.7 to 3.0.7-PL1 + case '3.0.7': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 22e8b34f3b..996ab5765d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -241,7 +241,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.7'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.7-PL1'); 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'); |