[gentoo-commits] proj/forums:origin/3.2.x commit in: build/, phpBB/includes/, phpBB/install/, phpBB/install/schemas/

[Jimi Huotari]

commit:     37e5457dcfd9c9b3a07c1ec8e248f6b648235386
Author:     Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 12:34:33 2019 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 12:34:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/forums.git/commit/?id=37e5457d

[prep-release-3.2.6] Update to 3.2.6 version

 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/phpbbcli.php            | 2 +-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 0dc59455c..d1232a97f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" 
basedir="../">
        <!-- a few settings for the build -->
-       <property name="newversion" value="3.2.6-RC1" />
+       <property name="newversion" value="3.2.6" />
        <property name="prevversion" value="3.2.5" />
-       <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" />
+       <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.6-RC1" />
        <!-- no configuration should be needed beyond this point -->
 
        <property name="oldversions" value="${olderversions}, ${prevversion}" />

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 98b60166a..b22f003ad 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.2.6-RC1');
+@define('PHPBB_VERSION', '3.2.6');
 
 // QA-related
 // define('PHPBB_QA', 1);

diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index c87a9a83a..f8683d8f0 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.2.6-RC1');
+define('PHPBB_VERSION', '3.2.6');
 $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 fada5b6cb..4d9adfd3d 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -279,7 +279,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.2.6-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', 
'3.2.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');