From 301694e9228944e501af3aa7daa4d7b760c7ee23 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 19 Sep 2014 19:02:31 +0200 Subject: [PATCH 1/5] [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 --- 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 56fe802824..0eb2b06783 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 0eac2e9417..2c98327634 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-RC4-dev'); +define('PHPBB_VERSION', '3.1.0-RC4'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index d09f71ae22..4ec408a670 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-RC3', + 'phpbb_version' => '3.1.0-RC4', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 90b1ac8f92..d6c07ad433 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-RC4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC4'); 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 aea59021d6..1c4315f937 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-RC3 -phpbb_version = 3.1.0-RC3 +style_version = 3.1.0-RC4 +phpbb_version = 3.1.0-RC4 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 3ef3154742..0c0bd04456 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-RC3 -phpbb_version = 3.1.0-RC3 +style_version = 3.1.0-RC4 +phpbb_version = 3.1.0-RC4 # Defining a different template bitfield # template_bitfield = lNg= From 221f4a4a8c1290c43ea038d06cd8cab56ff97f8f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 19 Sep 2014 19:04:21 +0200 Subject: [PATCH 2/5] [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 --- phpBB/phpbb/db/migration/data/v310/rc4.php | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/rc4.php diff --git a/phpBB/phpbb/db/migration/data/v310/rc4.php b/phpBB/phpbb/db/migration/data/v310/rc4.php new file mode 100644 index 0000000000..47de8291c1 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc4.php @@ -0,0 +1,32 @@ + +* @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 rc4 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc3', + '\phpbb\db\migration\data\v310\notifications_use_full_name', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC4')), + ); + } +} From 841abf712e4f202b2d170d0416cd6ba2374ead9b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 19 Sep 2014 19:07:41 +0200 Subject: [PATCH 3/5] [prep-release-3.1.0-RC4] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 65 ++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d882d2e3f4..3d58daa038 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-RC3
    2. Changes since 3.1.0-RC2
    3. Changes since 3.1.0-RC1
    4. Changes since 3.1.0-b4
      5. @@ -96,7 +97,9 @@
      -

      1.i. Changes since 3.1.0-RC2

      +

      1.i. Changes since 3.1.0-RC3

      + +

      1.ii. Changes since 3.1.0-RC2

      Bug

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

      1.ii. Changes since 3.1.0-RC1

      +

      1.iii. Changes since 3.1.0-RC1

      Bug

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

      1.iii. Changes since 3.1.0-b4

      +

      1.iv. Changes since 3.1.0-b4

      Bug

        @@ -411,7 +414,7 @@
      -

      1.iv. Changes since 3.1.0-b3

      +

      1.v. Changes since 3.1.0-b3

      Bug

        @@ -518,7 +521,7 @@
      -

      1.v. Changes since 3.1.0-b2

      +

      1.vi. Changes since 3.1.0-b2

      Bug

        @@ -683,7 +686,7 @@
      -

      1.vi. Changes since 3.1.0-b1

      +

      1.vii. Changes since 3.1.0-b1

      Bug

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

      1.vii. Changes since 3.1.0-a3

      +

      1.viii. Changes since 3.1.0-a3

      Bug

        @@ -898,7 +901,7 @@
      -

      1.viii. Changes since 3.1.0-a2

      +

      1.ix. Changes since 3.1.0-a2

      Bug

        @@ -1006,7 +1009,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.ix. Changes since 3.1.0-a1

      +

      1.x. Changes since 3.1.0-a1

      Bug

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

      1.x. Changes since 3.0.x

      +

      1.xi. Changes since 3.0.x

      Bug

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

      1.xi. Changes since 3.0.11

      +

      1.xii. Changes since 3.0.11

      Bug

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

      1.xii. Changes since 3.0.10

      +

      1.xiii. Changes since 3.0.10

      Bug

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

      1.xiii. Changes since 3.0.9

      +

      1.xiv. Changes since 3.0.9

      Bug

        @@ -2179,7 +2182,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xiv. Changes since 3.0.8

      +

      1.xv. Changes since 3.0.8

      Bug

      @@ -2547,7 +2550,7 @@ -

      1.xv. Changes since 3.0.7-PL1

      +

      1.xvi. Changes since 3.0.7-PL1

      Security

        @@ -3005,13 +3008,13 @@
      -

      1.xvi. Changes since 3.0.7

      +

      1.xvii. 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.xvii. Changes since 3.0.6

      +

      1.xviii. Changes since 3.0.6

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

      1.xviii. Changes since 3.0.5

      +

      1.xix. Changes since 3.0.5

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

      1.xix. Changes since 3.0.4

      +

      1.xx. Changes since 3.0.4

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

      1.xx. Changes since 3.0.3

      +

      1.xxi. Changes since 3.0.3

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

      1.xxi. Changes since 3.0.2

      +

      1.xxii. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -3557,7 +3560,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.xxii. Changes since 3.0.1

      +

      1.xxiii. Changes since 3.0.1

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

      1.xxiii. Changes since 3.0.0

      +

      1.xxiv. Changes since 3.0.0

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

      1.xxiv. Changes since 3.0.RC8

      +

      1.xxv. 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)
        • @@ -3685,7 +3688,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xxv. Changes since 3.0.RC7

      +

      1.xxvi. Changes since 3.0.RC7

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

      1.xxvi. Changes since 3.0.RC6

      +

      1.xxvii. Changes since 3.0.RC6

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

      1.xxvii. Changes since 3.0.RC5

      +

      1.xxviii. 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.
        • @@ -3793,7 +3796,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xxviii. Changes since 3.0.RC4

      +

      1.xxix. Changes since 3.0.RC4

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

      1.xxix. Changes since 3.0.RC3

      +

      1.xxx. Changes since 3.0.RC3

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

      1.xxx. Changes since 3.0.RC2

      +

      1.xxxi. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3999,7 +4002,7 @@
      -

      1.xxxi. Changes since 3.0.RC1

      +

      1.xxxii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 2c5e184ea15a10548acb0ea1a832f30f77534584 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 19 Sep 2014 19:09:46 +0200 Subject: [PATCH 4/5] [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 --- phpBB/docs/CHANGELOG.html | 90 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3d58daa038..7b46129c6c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,7 +97,95 @@
        -

        1.i. Changes since 3.1.0-RC3

        +

        1.i. Changes since 3.1.0-RC3

        + +

        Bug

        +
          +
        • [PHPBB3-10472] - ACP "add multiple smilies" page is unusable on 1024x768 resolution
          • +
        • [PHPBB3-11909] - phpbb/db/migrator::load_migrations is never called
          • +
        • [PHPBB3-12258] - Add attachment: error alert popup on "empty.png" does not show up
          • +
        • [PHPBB3-12506] - Long post titles bump the username down an extra row beneath the edit/quote/delete buttons
          • +
        • [PHPBB3-12658] - Add tests for config:* cli commands
          • +
        • [PHPBB3-12661] - Extensions templates not loaded from "all" by helper/render()
          • +
        • [PHPBB3-12734] - Custom profile manager should not suppress errors when inserting user rows
          • +
        • [PHPBB3-12765] - acp_profile.php should use db/tools
          • +
        • [PHPBB3-12852] - \phpbb\path_helper get_url_parts does not handle get variable with no value
          • +
        • [PHPBB3-12856] - plupload images are not integrated into style-path
          • +
        • [PHPBB3-12862] - Smiley and Whos Onlike pop-up boxes are making styling difficult
          • +
        • [PHPBB3-12949] - Undefined function mime_content_type()
          • +
        • [PHPBB3-12966] - Undefined sorting of posts with same post_time on postgres
          • +
        • [PHPBB3-12975] - Catchable fatal error after update to RC3
          • +
        • [PHPBB3-12976] - Pagination of UCP manage attachments page in prosilver does not support plural forms
          • +
        • [PHPBB3-12983] - UCP preferences, Display posts ordering by: input is not properly validated
          • +
        • [PHPBB3-12984] - Index page: blank line when no forum description shown
          • +
        • [PHPBB3-12986] - Wrong functions call order breaks detection of common words in search
          • +
        • [PHPBB3-12990] - The prefix for the notification's services is harcoded
          • +
        • [PHPBB3-12996] - tests/lock/flock_test.php should use microtime() instead of time()
          • +
        • [PHPBB3-12998] - Undefined $lang in mcp_warn.php::add_warning()
          • +
        • [PHPBB3-13004] - Topic tools button is displayed even if dropdown is empty
          • +
        • [PHPBB3-13008] - Importing a resource in routing.yml breaks download/file.php and ACP
          • +
        • [PHPBB3-13009] - Cleanup Tweaks CSS, Remove outdated browser support
          • +
        • [PHPBB3-13018] - Key binding on AJAX popups are not unbound upon close/cancel
          • +
        • [PHPBB3-13019] - Don't display "Soft delete reason" dialog when moderator cannot soft-delete
          • +
        • [PHPBB3-13022] - "Return to advanced search" wrong assumption
          • +
        • [PHPBB3-13031] - Impossible to properly upload image if no proper mimetype guessers enabled
          • +
        • [PHPBB3-13035] - Empty meta tags in header
          • +
        • [PHPBB3-13040] - W3C validator warning in overral_footer.html
          • +
        • [PHPBB3-13042] - Unused var in login_box()
          • +
        • [PHPBB3-13044] - Expires header violates RFC 2616
          • +
        • [PHPBB3-13046] - In download/avatar we don't load the vendors added by the extensions
          • +
        • [PHPBB3-13050] - Allow topic/forum subscription when email and jabber are off
          • +
        • [PHPBB3-13051] - Fix broken viewonline core event
          • +
        • [PHPBB3-13052] - Remove additional parameters from check_form_key()
          • +
        • [PHPBB3-13057] - Fatal error on previous page link after closing a report
          • +
        • [PHPBB3-13065] - Unknown column 'user_pass_convert' in 'field list' [code] - => 1054
          • +
        • [PHPBB3-13068] - Language correction in FIELD_IS_CONTACT_EXPLAIN
          • +
        • [PHPBB3-13069] - Timezone selector does not filter locations on change
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-12416] - WhoIs Pop Up Page Details
          • +
        • [PHPBB3-12598] - Improve action-bar search box styling
          • +
        • [PHPBB3-12653] - Caches the informations about the listeners to be able to not load them everytime
          • +
        • [PHPBB3-12900] - 3.1.0 avatar scaling
          • +
        • [PHPBB3-12943] - Add core.phpbb_generate_debug_output core event
          • +
        • [PHPBB3-12961] - Add link in anti-spam ACP page which links directly to captchas in titania
          • +
        • [PHPBB3-12969] - Add template event around the find username link on composing pm
          • +
        • [PHPBB3-12982] - JS in 3.1 is nasty
          • +
        • [PHPBB3-12989] - Remove unused "created_by.jpg" from prosilver
          • +
        • [PHPBB3-12991] - Have events after/before "add warning" field - user and post
          • +
        • [PHPBB3-12994] - Add core event to viewtopic.php before sending vars to template
          • +
        • [PHPBB3-13003] - Missing language keys in command "extension:show"
          • +
        • [PHPBB3-13005] - Add core event to display_forums() to modify category template data
          • +
        • [PHPBB3-13006] - Add variables to the 'core.modify_quickmod_actions' event
          • +
        • [PHPBB3-13010] - phpbb_get_avatar() incorrectly refers to \phpbb\avatar\driver\driver::clean_row()
          • +
        • [PHPBB3-13020] - Add var to core.viewforum_get_topic_data event to allow modifying forum template data
          • +
        • [PHPBB3-13024] - Template event viewtopic_body_postrow_post_content_footer
          • +
        • [PHPBB3-13026] - Add template vars array to core.viewonline_overwrite_location to allow modifying/adding template vars
          • +
        • [PHPBB3-13034] - Add ability to access extensions outside the phpBB root
          • +
        • [PHPBB3-13036] - Controller helper route method should be able to generate absolute URL's
          • +
        • [PHPBB3-13038] - Link user post tally to their posts
          • +
        • [PHPBB3-13047] - Add $post_list array to core.viewtopic_modify_page_title core event
          • +
        • [PHPBB3-13056] - Move the arguments of the request class to the DI
          • +
        • [PHPBB3-13058] - The "jump to page" input does not have a min attribute.
          • +
        • [PHPBB3-13061] - Use a compiler pass to replace the service event.subscriber_loader
          • +
        • [PHPBB3-13062] - Add viewforum.php core event to allow modifying sql query to select topic ids
          • +
        • [PHPBB3-13066] - Add common search results core event to modify search title
          • +
        +

        New Feature

        + +

        Sub-task

        +
          +
        • [PHPBB3-12928] - [Event] - core.mcp_reports_gather_query_before
          • +
        +

        Task

        + +

        1.ii. Changes since 3.1.0-RC2

        From 26c6ffa458a70fa30d8bf925418ddf05cf86d1de Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 20 Sep 2014 09:52:53 +0200 Subject: [PATCH 5/5] [prep-release-3.1.0-RC4] Update phpBB Version for RC4 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 0eb2b06783..8ac7c1758c 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 2c98327634..b72e4ab6d4 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-RC4'); +define('PHPBB_VERSION', '3.1.0-RC5-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index d6c07ad433..baabe90f2a 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-RC4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC5-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');