diff --git a/build/build.xml b/build/build.xml index 538c62f24a..d740bb6efe 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 05c0b947cb..4758c9c59a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.4
    • Changes since 3.2.4-RC1
    • Changes since 3.2.3
    • Changes since 3.2.3-RC2
      • @@ -133,6 +134,28 @@
      +

      Changes since 3.2.4

      +

      Bug

      +
        +
      • [PHPBB3-15665] - MSSQL implementation crashes when upload directory > 2GB
        • +
      • [PHPBB3-15858] - Unapproved User(s) appearing as Guest in Team Page.
        • +
      • [PHPBB3-15867] - Contact form without class
        • +
      • [PHPBB3-15871] - PHP 7.1+ warning in ACP extensions module
        • +
      • [PHPBB3-15875] - BBCode parsing error (PHP fatal error)
        • +
      • [PHPBB3-15881] - Login keys are not reset after password update in some cases
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-15542] - Some JS files being called without assets version
        • +
      • [PHPBB3-15859] - Modify the topic ordering if needed
        • +
      • [PHPBB3-15863] - Modify the topic sort ordering from the beginning
        • +
      • [PHPBB3-15870] - Modify the forum ID to handle the correct display of viewtopic if needed
        • +
      • [PHPBB3-15872] - Add show_user_activity to display_user_activity_modify_actives
        • +
      • [PHPBB3-15873] - Event to add/modify MCP report details template data.
        • +
      • [PHPBB3-15878] - Add attachment to core.ucp_pm_view_message
        • +
      • [PHPBB3-15879] - Modify attachment's poster_id for get_submitted_attachment_data
        • +
      +

      Changes since 3.2.4-RC1

      Bug

        diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 70ceed1036..0c6595945c 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.5-dev'); +@define('PHPBB_VERSION', '3.2.5-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 14956e4541..2b4da2bb7f 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.2.4', + 'phpbb_version' => '3.2.5', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 8911274055..9221024998 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.4'); +define('PHPBB_VERSION', '3.2.5-RC1'); $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 158c8a1ac7..c6fa38919b 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.5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.5-RC1'); 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/phpbb/db/migration/data/v32x/v325rc1.php b/phpBB/phpbb/db/migration/data/v32x/v325rc1.php new file mode 100644 index 0000000000..2d0de0a432 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v325rc1.php @@ -0,0 +1,36 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v32x; + +class v325rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.5-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\v324', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.5-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index b0b6a8ca28..a588f1e558 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.2.4 -phpbb_version = 3.2.4 +style_version = 3.2.5 +phpbb_version = 3.2.5 # Defining a different template bitfield # template_bitfield = //g=