aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-04 14:33:22 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-04 21:54:48 +0100
commiteb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424 (patch)
treeef03181efd6414e1334d2c24b1080b44ca622713
parent1b8193ab8b2c73d4a38520c206816817db168447 (diff)
downloadforums-eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424.tar
forums-eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424.tar.gz
forums-eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424.tar.bz2
forums-eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424.tar.xz
forums-eb8ace14c8d4fb7f0d080bf28ffb16f8d5fe8424.zip
[prep-release-3.3.0] Update version numbers for 3.3.0 release
-rw-r--r--build/build.xml2
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rwxr-xr-xphpBB/install/phpbbcli.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/styles/prosilver/style.cfg4
6 files changed, 7 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml
index ea137f50bc..587eda9f5e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
- <property name="newversion" value="3.3.0-RC2-dev" />
+ <property name="newversion" value="3.3.0" />
<property name="prevversion" value="3.2.9" />
<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.3.0-b1, 3.3.0-b2, 3.3.0-RC1" />
<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index e3dbdc4adb..9508ce5cfc 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-@define('PHPBB_VERSION', '3.3.0-RC2-dev');
+@define('PHPBB_VERSION', '3.3.0');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index f9b7e8010e..6da6e2eb22 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-RC1',
+ 'phpbb_version' => '3.3.0',
'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 9a9d320b30..cf8cfd18a3 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-RC1');
+define('PHPBB_VERSION', '3.3.0');
$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 b5fc4f13a5..e308c82357 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-RC2-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0');
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');
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 7cc7ba4922..0c7eba6700 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Limited, 2007
-style_version = 3.3.0-RC1
-phpbb_version = 3.3.0-RC1
+style_version = 3.3.0
+phpbb_version = 3.3.0
# Defining a different template bitfield
# template_bitfield = //g=