diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-06 02:20:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-06 02:29:04 +0100 |
| commit | 568fb83373361abb8c9f3886fee944a8d9e5f66d (patch) | |
| tree | 602256c8abb312f50e2776187e1e2ce02e52a5ea /phpBB/install | |
| parent | 5d1d32a65bced82f068dbed497cc418eae5f4701 (diff) | |
| parent | c4e02a191628b4b9f7b6340f2876607663baeb5a (diff) | |
| download | forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.gz forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.bz2 forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.xz forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.zip | |
Merge branch 'master' into develop-olympus
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
2 files changed, 8 insertions, 2 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 df8aadfdb2..7af0c86314 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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; } } |