diff --git a/build/build.xml b/build/build.xml index 258e97474a..5c6a79bb93 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 82ae9e7b0c..641c6a4846 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.1
    • Changes since 3.3.1-RC1
    • Changes since 3.3.0
    • Changes since 3.3.0-RC1
      • @@ -151,6 +152,49 @@
      +

      Changes since 3.3.1

      +

      Bug

      +
        +
      • [PHPBB3-16366] - Language dictionaries other than common.php are unavailable to BBCode templates in feeds
        • +
      • [PHPBB3-16488] - ACP build_cfg_template does not support 0 as minimum value
        • +
      • [PHPBB3-16512] - make_clickable() function does not apply custom classes
        • +
      • [PHPBB3-16525] - Database backup generates a general error with PostgreSQL 12+
        • +
      • [PHPBB3-16526] - Not proper handled comma-separated ACP configuration values
        • +
      • [PHPBB3-16532] - Example post is stored as invalid XML
        • +
      • [PHPBB3-16544] - topic_notify.txt is wrongly used for forum subscriptions
        • +
      • [PHPBB3-16565] - Circular dependencies when cron task depends on controller.helper
        • +
      • [PHPBB3-16568] - Problem with drop-down menu
        • +
      • [PHPBB3-16569] - Massive margin between posts when zoomed out in browser
        • +
      • [PHPBB3-16583] - Reset button in create search index not working
        • +
      • [PHPBB3-16588] - Update docs links from 3.2.x to 3.3.x
        • +
      • [PHPBB3-16593] - Undefined properties in create_search_index install task
        • +
      • [PHPBB3-16597] - Doctum can't build docs on branches older than 3.3.x
        • +
      • [PHPBB3-16602] - phpBB cannot be installed and/or run without iconv or mbstring
        • +
      • [PHPBB3-16605] - SQL Registration errors do not trigger an error correctly
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-15300] - Maximum attachment filesize is nowhere mentioned
        • +
      • [PHPBB3-16208] - No option for email for "Notify me" when a reported post is dealt with
        • +
      • [PHPBB3-16430] - Permission ordering
        • +
      • [PHPBB3-16472] - Remove PhantomJS UI tests
        • +
      • [PHPBB3-16527] - Add role_exists to migration tools
        • +
      • [PHPBB3-16533] - Add core and template events to customize UCP login keys management module
        • +
      • [PHPBB3-16556] - Remove purposeless <Files "*"> from .htaccess
        • +
      • [PHPBB3-16557] - Support piping tracker XML to build_changelog.php
        • +
      • [PHPBB3-16562] - Add explanation for password complexity when resetting password
        • +
      • [PHPBB3-16604] - Display error message if avatar upload folder is not writable
        • +
      • [PHPBB3-16608] - Modernize README
        • +
      • [PHPBB3-16612] - Restructure HTML for agreement, coppa, terms etc.
        • +
      +

      Task

      +
        +
      • [PHPBB3-15594] - The deprecated AOL contact field should be removed
        • +
      • [PHPBB3-16571] - Update s9e TextFormatter
        • +
      • [PHPBB3-16580] - Update rendering tests to match actual Prosilver
        • +
      • [PHPBB3-16616] - Update composer dependencies to latest versions
        • +
      +

      Changes since 3.3.1-RC1

      Bug

        diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 9e63a5c779..fcd8252b54 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -1,6 +1,6 @@ /** * -* phpBB © Copyright phpBB Limited 2003-2019 +* phpBB © Copyright phpBB Limited 2003-2020 * https://www.phpbb.com * * phpBB is free software. You can redistribute it and/or modify it diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index bff54c166b..3d1a94d7b2 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.2-dev'); +@define('PHPBB_VERSION', '3.3.2-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index f98810baf9..2616a0f333 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.1', + 'phpbb_version' => '3.3.2', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index d47b595866..d7843b016f 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.1'); +define('PHPBB_VERSION', '3.3.2-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 d05331b6c9..49697348f0 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock 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.2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.2-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/v33x/v332rc1.php b/phpBB/phpbb/db/migration/data/v33x/v332rc1.php new file mode 100644 index 0000000000..1126641345 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v332rc1.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\v33x; + +class v332rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.2-RC1', '>='); + } + + static public function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\remove_profilefield_aol', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.2-RC1']], + ]; + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8dd4bd0d0d..fca0a15588 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.1 -phpbb_version = 3.3.1 +style_version = 3.3.2 +phpbb_version = 3.3.2 # Defining a different template bitfield # template_bitfield = //g=