diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-23 14:23:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-23 14:23:39 +0100 |
| commit | 8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5 (patch) | |
| tree | e9cd01309a7f0eeaa5bb3c2884e6a44be664b5dd /phpBB/install | |
| parent | 3e9c2ea025a571c237d0855c4264caa913ba2b36 (diff) | |
| parent | 77a15e354246a22ad8d3eed6e3fcd9f9f046c9f8 (diff) | |
| download | forums-8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5.tar forums-8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5.tar.gz forums-8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5.tar.bz2 forums-8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5.tar.xz forums-8b7e0563a56cb34bc8c01b2af2a26a1c2fdccdd5.zip | |
Merge branch 'prep-release-3.3.0-b2' into 3.3.x
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 6da6e2eb22..cefb33fe3c 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.0', + 'phpbb_version' => '3.3.0-b2', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index b7a07488ac..6ac261aa13 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.0-b2-dev'); +define('PHPBB_VERSION', '3.3.0-b2'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 97fc23f0bf..32121d7972 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,7 @@ 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 ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-b2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-b2'); 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'); |