From 2eb8a97f4739c12d3b0b3026bd1a013f2c54a076 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 29 Apr 2016 20:21:25 +0200 Subject: [PATCH 1/4] [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build.xml b/build/build.xml index 24d935ad90..b7ef56e7e7 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index b3792dd8b9..154e4a1e43 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.0-b3-dev'); +@define('PHPBB_VERSION', '3.2.0-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 977670c94c..e5866add7d 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.0-b3-dev', + 'phpbb_version' => '3.2.0-RC1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 87eab84b5a..3803fe7034 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.0-b3-dev'); +define('PHPBB_VERSION', '3.2.0-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 9791174e0f..533448543f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -276,7 +276,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.0-b3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-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/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 690c35ca7a..895ee49dc4 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.0-b3-dev -phpbb_version = 3.2.0-b3-dev +style_version = 3.2.0-RC1 +phpbb_version = 3.2.0-RC1 # Defining a different template bitfield # template_bitfield = lNg= From 6145f46bd1ca36f4a03b29ffd05f8c7d143d473d Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 29 Apr 2016 20:22:41 +0200 Subject: [PATCH 2/4] [prep-release-3.2.0-RC1] Update schema.json --- phpBB/install/schemas/schema.json | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json index 9c278e5ff7..2b77c1efa5 100644 --- a/phpBB/install/schemas/schema.json +++ b/phpBB/install/schemas/schema.json @@ -800,22 +800,6 @@ "UINT:20", 0 ], - "enable_shadow_prune": [ - "BOOL", - 0 - ], - "prune_shadow_days": [ - "UINT", - 7 - ], - "prune_shadow_freq": [ - "UINT", - 1 - ], - "prune_shadow_next": [ - "INT:11", - 0 - ], "forum_posts_approved": [ "UINT", 0 @@ -839,6 +823,22 @@ "forum_topics_softdeleted": [ "UINT", 0 + ], + "enable_shadow_prune": [ + "BOOL", + 0 + ], + "prune_shadow_days": [ + "UINT", + 7 + ], + "prune_shadow_freq": [ + "UINT", + 1 + ], + "prune_shadow_next": [ + "INT:11", + 0 ] }, "PRIMARY_KEY": "forum_id", @@ -2138,26 +2138,10 @@ "VCHAR", "" ], - "pf_phpbb_location": [ - "VCHAR", - "" - ], "pf_phpbb_twitter": [ "VCHAR", "" ], - "pf_phpbb_website": [ - "VCHAR", - "" - ], - "pf_phpbb_youtube": [ - "VCHAR", - "" - ], - "pf_phpbb_googleplus": [ - "VCHAR", - "" - ], "pf_phpbb_facebook": [ "VCHAR", "" @@ -2166,6 +2150,22 @@ "VCHAR", "" ], + "pf_phpbb_youtube": [ + "VCHAR", + "" + ], + "pf_phpbb_location": [ + "VCHAR", + "" + ], + "pf_phpbb_googleplus": [ + "VCHAR", + "" + ], + "pf_phpbb_website": [ + "VCHAR", + "" + ], "pf_phpbb_yahoo": [ "VCHAR", "" From 7cbb049572de066a8d9214b78a8c523f50d7014c Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 29 Apr 2016 20:25:19 +0200 Subject: [PATCH 3/4] [prep-release-3.2.0-RC1] Add migration --- .../phpbb/db/migration/data/v320/v320rc1.php | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v320/v320rc1.php diff --git a/phpBB/phpbb/db/migration/data/v320/v320rc1.php b/phpBB/phpbb/db/migration/data/v320/v320rc1.php new file mode 100644 index 0000000000..a04a2abb19 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320rc1.php @@ -0,0 +1,40 @@ + +* @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\v320; + +use phpbb\db\migration\migration; + +class v320rc1 extends migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v319', + '\phpbb\db\migration\data\v320\report_id_auto_increment', + '\phpbb\db\migration\data\v320\v320b2', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-RC1')), + ); + } +} From e8c6a3aa0acad35954f9a6df5bfeff0a517f5397 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 29 Apr 2016 20:29:21 +0200 Subject: [PATCH 4/4] [prep-release-3.2.0-RC1] Update changelog --- phpBB/docs/CHANGELOG.html | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f8f63245df..34bc8a8703 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.0-b2
    • Changes since 3.2.0-b1
    • Changes since 3.2.0-a2
    • Changes since 3.2.0-a1
      • @@ -121,6 +122,60 @@
      +

      Changes since 3.2.0-b2

      +

      Bug

      +
        +
      • [PHPBB3-9435] - "magic numbers" in message_parser.php/bbcode.php
        • +
      • [PHPBB3-13616] - Pass lexer directly to TWIG environment
        • +
      • [PHPBB3-13972] - 3.1.5 - Waiting time conflict
        • +
      • [PHPBB3-14136] - IE compatibility meta is missing in overall_header.html
        • +
      • [PHPBB3-14198] - Container cache filename doesn't depend on the build options
        • +
      • [PHPBB3-14260] - Right parenthesis breaks (some?) magic URLs
        • +
      • [PHPBB3-14318] - Board Notifications Config Migration Not Working
        • +
      • [PHPBB3-14329] - Updater Cannot remove files
        • +
      • [PHPBB3-14381] - Text Reparser fails with empty sql fields
        • +
      • [PHPBB3-14393] - Update 3.2.0a1 to 3.2.0a2 --> Error: CANNOT_DELETE_FILES
        • +
      • [PHPBB3-14426] - viewtopic error posts bbcode pregmatch
        • +
      • [PHPBB3-14481] - phpBB does not obey HTTP_X_FORWARDED_PORT header
        • +
      • [PHPBB3-14497] - Update nginx sample config for new installer
        • +
      • [PHPBB3-14527] - Dataloss caused by link shortening
        • +
      • [PHPBB3-14528] - Structured data - breadcrumbs error
        • +
      • [PHPBB3-14530] - Signature parsing inconsistant
        • +
      • [PHPBB3-14532] - Database column default incorrectly escaped on MSSQL
        • +
      • [PHPBB3-14550] - function unique_id()
        • +
      • [PHPBB3-14555] - Inconsistent usage of the cache directory
        • +
      • [PHPBB3-14559] - Attachments' behaviour in quotes
        • +
      • [PHPBB3-14562] - Extension's permissions don't have language fallback
        • +
      • [PHPBB3-14564] - config cookie domain is empty
        • +
      • [PHPBB3-14569] - Add a method for console progress bar initialisation
        • +
      • [PHPBB3-14572] - Quote notifications deleted on edit
        • +
      • [PHPBB3-14576] - Functional Test Framework should include functions.php
        • +
      • [PHPBB3-14577] - Stop using sizeof() inside for() loop
        • +
      • [PHPBB3-14589] - Requirements test showing required text for "yellow/amber" (optional) requirements
        • +
      • [PHPBB3-14590] - Installer gets stuck at sending notification e-mail
        • +
      • [PHPBB3-14591] - Some installation data not being inserted when running under MS SQL Server
        • +
      • [PHPBB3-14607] - Missing Auto Increment in Report Table
        • +
      • [PHPBB3-14619] - docs/ folder need work to change 3.1.x to 3.2.x in readme, install, changelog etc
        • +
      • [PHPBB3-14648] - Users don't receive default notifications if another setting is set.
        • +
      • [PHPBB3-14649] - Missing variable within event
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13502] - controller resolver should handle callable functions and objects
        • +
      • [PHPBB3-14540] - Adjust class recursive_dot_prefix_filter_iterator to increase performance
        • +
      • [PHPBB3-14561] - Add additional commands for user actions
        • +
      • [PHPBB3-14664] - Fix PHPDoc comment in cron manager
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-12684] - Add a command to add a user from the CLI
        • +
      +

      Task

      + +

      Changes since 3.2.0-b1

      Bug