From 7137dc387abd129adbcb168424f73696aa13e74c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2014 21:10:14 +0200 Subject: [PATCH 1/5] [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- phpBB/styles/subsilver2/style.cfg | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index a9befcae48..52646bb82e 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 b72e4ab6d4..deb349b425 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.1.0-RC5-dev'); +define('PHPBB_VERSION', '3.1.0-RC5'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 4ec408a670..cab3fd7f1f 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.1.0-RC4', + 'phpbb_version' => '3.1.0-RC5', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index baabe90f2a..737d6871b7 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,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.1.0-RC5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC5'); 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 1c4315f937..8853bd4382 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.1.0-RC4 -phpbb_version = 3.1.0-RC4 +style_version = 3.1.0-RC5 +phpbb_version = 3.1.0-RC5 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 0c0bd04456..b8de165608 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.0-RC4 -phpbb_version = 3.1.0-RC4 +style_version = 3.1.0-RC5 +phpbb_version = 3.1.0-RC5 # Defining a different template bitfield # template_bitfield = lNg= From 7f692e7b2815b5c8198485769ab371be65caa738 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2014 21:12:06 +0200 Subject: [PATCH 2/5] [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 --- phpBB/phpbb/db/migration/data/v310/rc5.php | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/rc5.php diff --git a/phpBB/phpbb/db/migration/data/v310/rc5.php b/phpBB/phpbb/db/migration/data/v310/rc5.php new file mode 100644 index 0000000000..5b6f70e32e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc5.php @@ -0,0 +1,33 @@ + +* @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\v310; + +class rc5 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc4', + '\phpbb\db\migration\data\v310\profilefield_field_validation_length', + '\phpbb\db\migration\data\v310\remove_acp_styles_cache', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC5')), + ); + } +} From 9d13b91f468aab3a41d9995c79871ec1b543849c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2014 21:14:55 +0200 Subject: [PATCH 3/5] [prep-release-3.1.0-RC5] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 67 ++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7b46129c6c..193e76331b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-RC4
    2. Changes since 3.1.0-RC3
    3. Changes since 3.1.0-RC2
    4. Changes since 3.1.0-RC1
      5. @@ -97,7 +98,9 @@
      -

      1.i. Changes since 3.1.0-RC3

      +

      1.i. Changes since 3.1.0-RC4

      + +

      1.ii. Changes since 3.1.0-RC3

      Bug

        @@ -187,7 +190,7 @@
      -

      1.ii. Changes since 3.1.0-RC2

      +

      1.iii. Changes since 3.1.0-RC2

      Bug

        @@ -311,7 +314,7 @@
      • [PHPBB3-12948] - Remove Travis CI "broken opcache on PHP 5.5.7 and 5.5.8" workaround.
      -

      1.iii. Changes since 3.1.0-RC1

      +

      1.iv. Changes since 3.1.0-RC1

      Bug

        @@ -382,7 +385,7 @@
      • [PHPBB3-12829] - Remove check for pgsql 8.3/8.2
      -

      1.iv. Changes since 3.1.0-b4

      +

      1.v. Changes since 3.1.0-b4

      Bug

        @@ -502,7 +505,7 @@
      -

      1.v. Changes since 3.1.0-b3

      +

      1.vi. Changes since 3.1.0-b3

      Bug

        @@ -609,7 +612,7 @@
      -

      1.vi. Changes since 3.1.0-b2

      +

      1.vii. Changes since 3.1.0-b2

      Bug

        @@ -774,7 +777,7 @@
      -

      1.vii. Changes since 3.1.0-b1

      +

      1.viii. Changes since 3.1.0-b1

      Bug

        @@ -842,7 +845,7 @@
      • [PHPBB3-12302] - Upgrade composer.phar to 1.0.0-alpha8
      -

      1.viii. Changes since 3.1.0-a3

      +

      1.ix. Changes since 3.1.0-a3

      Bug

        @@ -989,7 +992,7 @@
      -

      1.ix. Changes since 3.1.0-a2

      +

      1.x. Changes since 3.1.0-a2

      Bug

        @@ -1097,7 +1100,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.x. Changes since 3.1.0-a1

      +

      1.xi. Changes since 3.1.0-a1

      Bug

        @@ -1173,7 +1176,7 @@
      • [PHPBB3-11998] - Add console / command line client environment
      -

      1.xi. Changes since 3.0.x

      +

      1.xii. Changes since 3.0.x

      Bug

        @@ -1854,7 +1857,7 @@
      • [PHPBB3-11913] - Apply reorganisation of download.phpbb.com to build_announcement.php
      -

      1.xii. Changes since 3.0.11

      +

      1.xiii. Changes since 3.0.11

      Bug

        @@ -2009,7 +2012,7 @@
      • [PHPBB3-11753] - Upgrade mysql_upgrader.php schema data.
      -

      1.xiii. Changes since 3.0.10

      +

      1.xiv. Changes since 3.0.10

      Bug

        @@ -2134,7 +2137,7 @@
      • [PHPBB3-10909] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2
      -

      1.xiv. Changes since 3.0.9

      +

      1.xv. Changes since 3.0.9

      Bug

        @@ -2270,7 +2273,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xv. Changes since 3.0.8

      +

      1.xvi. Changes since 3.0.8

      Bug

      @@ -2638,7 +2641,7 @@ -

      1.xvi. Changes since 3.0.7-PL1

      +

      1.xvii. Changes since 3.0.7-PL1

      Security

        @@ -3096,13 +3099,13 @@
      -

      1.xvii. Changes since 3.0.7

      +

      1.xviii. Changes since 3.0.7

      • [Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)
      -

      1.xviii. Changes since 3.0.6

      +

      1.xix. Changes since 3.0.6

      • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)
        • @@ -3206,7 +3209,7 @@
      -

      1.xix. Changes since 3.0.5

      +

      1.xx. Changes since 3.0.5

      • [Fix] Allow whitespaces in avatar gallery names. (Bug #44955)
        • @@ -3428,7 +3431,7 @@
      • [Feature] Send anonymous statistical information to phpBB on installation and update (optional).
      -

      1.xx. Changes since 3.0.4

      +

      1.xxi. Changes since 3.0.4

      • [Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)
        • @@ -3517,7 +3520,7 @@
      • [Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)
      -

      1.xxi. Changes since 3.0.3

      +

      1.xxii. Changes since 3.0.3

      • [Fix] Allow mixed-case template directories to be inherited (Bug #36725)
        • @@ -3549,7 +3552,7 @@
      • [Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)
      -

      1.xxii. Changes since 3.0.2

      +

      1.xxiii. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -3648,7 +3651,7 @@
      • [Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)
      -

      1.xxiii. Changes since 3.0.1

      +

      1.xxiv. Changes since 3.0.1

      • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
        • @@ -3696,7 +3699,7 @@
      • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
      -

      1.xxiv. Changes since 3.0.0

      +

      1.xxv. Changes since 3.0.0

      • [Change] Validate birthdays (Bug #15004)
        • @@ -3767,7 +3770,7 @@
      • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
      -

      1.xxv. Changes since 3.0.RC8

      +

      1.xxvi. Changes since 3.0.RC8

      • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
        • @@ -3776,7 +3779,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xxvi. Changes since 3.0.RC7

      +

      1.xxvii. Changes since 3.0.RC7

      • [Fix] Fixed MSSQL related bug in the update system
        • @@ -3811,7 +3814,7 @@
      • [Fix] No duplication of active topics (Bug #15474)
      -

      1.xxvii. Changes since 3.0.RC6

      +

      1.xxviii. Changes since 3.0.RC6

      • [Fix] Submitting language changes using acp_language (Bug #14736)
        • @@ -3821,7 +3824,7 @@
      • [Fix] Able to request new password (Bug #14743)
      -

      1.xxviii. Changes since 3.0.RC5

      +

      1.xxix. Changes since 3.0.RC5

      • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
        • @@ -3884,7 +3887,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xxix. Changes since 3.0.RC4

      +

      1.xxx. Changes since 3.0.RC4

      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • @@ -3935,7 +3938,7 @@
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      -

      1.xxx. Changes since 3.0.RC3

      +

      1.xxxi. Changes since 3.0.RC3

      • [Fix] Fixing some subsilver2 and prosilver style issues
        • @@ -4044,7 +4047,7 @@
      -

      1.xxxi. Changes since 3.0.RC2

      +

      1.xxxii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -4090,7 +4093,7 @@
      -

      1.xxxii. Changes since 3.0.RC1

      +

      1.xxxiii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 366451c11c5a0b964e1833a08ec1bcb025f71f9b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2014 21:16:34 +0200 Subject: [PATCH 4/5] [prep-release-3.1.0-RC5] Add changelog for 3.1.0-RC5 --- phpBB/docs/CHANGELOG.html | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 193e76331b..3658ae5e3b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -100,6 +100,71 @@

        1.i. Changes since 3.1.0-RC4

        +

        Bug

        +
          +
        • [PHPBB3-10729] - Post editor information is not updated when user being deleted with posts
          • +
        • [PHPBB3-11224] - SQL cache destroy does not destroy queries to tables joined
          • +
        • [PHPBB3-12368] - Updating database fails in upgrade from 3.0 when trying twice without purging the cache
          • +
        • [PHPBB3-12489] - Description for Contact link in custom profile fields
          • +
        • [PHPBB3-12657] - Add a test file for cli command cache:purge
          • +
        • [PHPBB3-12858] - 'GMT' is hard coded and not pulled from language files
          • +
        • [PHPBB3-12889] - multi-select element in unban email-adresses not limited in width
          • +
        • [PHPBB3-13011] - Javascript bug when selecting first one or two characters of a post
          • +
        • [PHPBB3-13027] - PM folder full percentage could be a bit more accurate
          • +
        • [PHPBB3-13033] - Duplicate entry SQL error thrown when running notifications_use_full_name migration
          • +
        • [PHPBB3-13045] - Pragma header not specified as response header by RFC2616
          • +
        • [PHPBB3-13048] - AJAX requests are being stored to session_page
          • +
        • [PHPBB3-13055] - String profile fields validation limits content to latin chars only
          • +
        • [PHPBB3-13070] - Wrong hook name is registered for array(template, display)
          • +
        • [PHPBB3-13071] - total_match_count is used before core.search_get_posts_data event
          • +
        • [PHPBB3-13080] - Responsive design - language variable to long
          • +
        • [PHPBB3-13082] - Search box does not displayed proper in admin cp when no logs listed
          • +
        • [PHPBB3-13085] - Fix typo in oauth.php
          • +
        • [PHPBB3-13086] - Update ACP_MASS_EMAIL_EXPLAIN language key
          • +
        • [PHPBB3-13087] - WLM link is empty in viewtopic
          • +
        • [PHPBB3-13097] - Fix missing unit type in forms.css
          • +
        • [PHPBB3-13104] - Responsive tabs display bug in IE11
          • +
        • [PHPBB3-13105] - Future dates are displayed as "Tomorrow" with relative date format
          • +
        • [PHPBB3-13111] - Debug output when editing DropDown Custom Fields with multiple languages
          • +
        • [PHPBB3-13113] - The routes are not always generated for the good app.php file
          • +
        • [PHPBB3-13116] - Topic and post approval notifications got interchanged
          • +
        • [PHPBB3-13117] - Installation fails on MySQL 5.7 because auto_increment columns can be NULL
          • +
        • [PHPBB3-13118] - datetime.class parameter not used in user class
          • +
        • [PHPBB3-13120] - phpbb_load_extensions_autoloaders() doesn't work very well with the extensions behind a symlink
          • +
        • [PHPBB3-13121] - Customise Purge Cache always returns user to Styles page
          • +
        • [PHPBB3-13125] - Uploaded avatars are not displayed in IE <= 7
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-12408] - Add quick setting for "default guest style" to ACP board settings
          • +
        • [PHPBB3-12985] - Add event to modify the redirect after a successful login
          • +
        • [PHPBB3-12993] - Add event to get_user_rank() function
          • +
        • [PHPBB3-13025] - Add template events for buttons on viewforum and viewtopic
          • +
        • [PHPBB3-13059] - Add core event to generate_page_link() to allow modifying pagination URLs
          • +
        • [PHPBB3-13072] - Add total_match_count to core.search_get_topic_data event
          • +
        • [PHPBB3-13077] - Change module order in Customise tab for better usability
          • +
        • [PHPBB3-13094] - Remove the search box if there are no new posts to search for
          • +
        • [PHPBB3-13107] - Add template events to forum row in forumlist_body.html
          • +
        • [PHPBB3-13108] - Add core event to the parse_attachments() function to allow modifying files info
          • +
        • [PHPBB3-13110] - Add core event to the page_footer() function to allow handling overall output
          • +
        • [PHPBB3-13122] - phpbb_wrapper_gmgetdate_test intermittently fails
          • +
        • [PHPBB3-13134] - Add core event to the root of the function display_forums()
          • +
        • [PHPBB3-13137] - Remove schema.json from repository
          • +
        +

        Sub-task

        +
          +
        • [PHPBB3-12929] - Add an event when getting the information for PM composal
          • +
        • [PHPBB3-12930] - Add an event to the query getting the post for quoting in a PM
          • +
        +

        Task

        +
          +
        • [PHPBB3-10794] - Make schema available at runtime
          • +
        • [PHPBB3-12987] - Cleanup the services.yml file
          • +
        • [PHPBB3-13106] - Remove the \phpbb\di\pass\kernel_pass class
          • +
        • [PHPBB3-13119] - Add events to mcp and acp ban modules
          • +
        • [PHPBB3-13123] - Add events to allow post blocking and post pre/past processing
          • +
        +

        1.ii. Changes since 3.1.0-RC3

        Bug

        From eed4d0d30f6732474d01c787c30cf7f80b584b07 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 7 Oct 2014 22:10:45 +0200 Subject: [PATCH 5/5] [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 52646bb82e..de0f916a1f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index deb349b425..6693b822fe 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.1.0-RC5'); +define('PHPBB_VERSION', '3.1.0-RC6-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 737d6871b7..adbd5a540e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,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.1.0-RC5'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6-dev'); 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');