diff --git a/build/build.xml b/build/build.xml index 9b088982e8..991d344331 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 71971108b1..d882d2e3f4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,8 +46,9 @@
  1. Changelog
      -
    1. Changes since 3.1.0-RC1
      2. -
    2. Changes since 3.1.0-b4
      3. +
    3. Changes since 3.1.0-RC2
      4. +
    4. Changes since 3.1.0-RC1
      5. +
    5. Changes since 3.1.0-b4
    6. Changes since 3.1.0-b3
    7. Changes since 3.1.0-b2
    8. Changes since 3.1.0-b1
      9. @@ -95,7 +96,131 @@
      -

      1.i. Changes since 3.1.0-RC1

      +

      1.i. Changes since 3.1.0-RC2

      + +

      Bug

      +
        +
      • [PHPBB3-11148] - Fix uploading attachments from Android 4 powered devices
        • +
      • [PHPBB3-11480] - Prevent Private Message system from returning "Unknown folder" when inbox folder is full
        • +
      • [PHPBB3-11520] - Post count not incremented when you fork a topic
        • +
      • [PHPBB3-11854] - Captcha code is still in includes/
        • +
      • [PHPBB3-12232] - MCP Banning: Max execution time exceeded
        • +
      • [PHPBB3-12448] - Migration tools don't allow adding columns with default == NULL
        • +
      • [PHPBB3-12492] - DB_TEST: Special chars are not supported.
        • +
      • [PHPBB3-12535] - The profile link should be better adjusted to the avatar image it surrounds in viewtopic.php
        • +
      • [PHPBB3-12685] - CLI doesn't load extension commands
        • +
      • [PHPBB3-12710] - phpBB 3.0.12 on Oracle fails to upgrade to 3.1.0
        • +
      • [PHPBB3-12718] - Hard Deleting Post does not Decrease Post Count
        • +
      • [PHPBB3-12742] - Notifications duplicate code that requires an event
        • +
      • [PHPBB3-12744] - RTL board header is one line higher than LTR
        • +
      • [PHPBB3-12748] - UCP Terms of Use Typo
        • +
      • [PHPBB3-12770] - search_wordmatch unique key name is too long
        • +
      • [PHPBB3-12776] - docs/INSTALL.html is missing 3.0 to 3.1 update instructions
        • +
      • [PHPBB3-12789] - Cached directories are not deleted when the cache is purged (with ACM memory enabled).
        • +
      • [PHPBB3-12791] - String profile fields do not use links, smilies and line breaks in memberlist
        • +
      • [PHPBB3-12792] - Profile field type strings function get_profile_contact_value duplicates raw()
        • +
      • [PHPBB3-12793] - String '0' does not display for string profile fields
        • +
      • [PHPBB3-12794] - Google+ profile field validation is too strict
        • +
      • [PHPBB3-12809] - RTL styling issues with new jump-box dropdown
        • +
      • [PHPBB3-12814] - Error while trying to setup LDAP Authentication in ACP
        • +
      • [PHPBB3-12822] - Preselect avatar type if only 1 type is enabled
        • +
      • [PHPBB3-12837] - Viewing contact form displays "VIEWING_MEMBERS" on viewonline
        • +
      • [PHPBB3-12842] - Out of memory issue in code sniffer call for extensions
        • +
      • [PHPBB3-12843] - When you click on "Mark forums read" in the browser, a console error occurs
        • +
      • [PHPBB3-12844] - $dbpasswd is cleared too early in connection manager
        • +
      • [PHPBB3-12845] - HTML5 Invalid using role="navigation"
        • +
      • [PHPBB3-12846] - SQLite3 bug in profilefield_base_migration.php
        • +
      • [PHPBB3-12849] - ReferenceError in core.js
        • +
      • [PHPBB3-12851] - Font colour button title is not consistent with other buttons
        • +
      • [PHPBB3-12853] - Problems with ACP/MCP links in mobile design with other translations
        • +
      • [PHPBB3-12854] - Admin contact page should not be used when board emails are disabled
        • +
      • [PHPBB3-12855] - Container is being recompiled on every page request although DEBUG_CONTAINER is not set
        • +
      • [PHPBB3-12859] - Missing post button events from view pm template
        • +
      • [PHPBB3-12870] - Console database migrate function can not update from 3.0.12 to 3.1
        • +
      • [PHPBB3-12873] - Wrong identifier tested in \db\tools\sql_create_(unique_)index()
        • +
      • [PHPBB3-12875] - Extension's info_acp_lang files don't fallback correctly when the user's language is not included in the extension
        • +
      • [PHPBB3-12881] - Debug error - Undefined index: mark_time
        • +
      • [PHPBB3-12882] - $config['search_type'] - is not correctly updated when updating from 3.0 to 3.1
        • +
      • [PHPBB3-12883] - Do not use basename() to get the search class in phpbb\cron\task\core\tidy_search
        • +
      • [PHPBB3-12886] - Redundant lock and unlock expressions for QuickMod in viewtopic.php
        • +
      • [PHPBB3-12887] - Typo in timezone handling code: 'offest' should be 'offset'
        • +
      • [PHPBB3-12891] - Long page generation time when banlist is long
        • +
      • [PHPBB3-12895] - ?style=1 appended to url after using the UCP
        • +
      • [PHPBB3-12898] - In cron.php we try to release the lock after the call to garbage_collection()
        • +
      • [PHPBB3-12901] - Wrong type hint in show_available_child_styles() doc block
        • +
      • [PHPBB3-12902] - Remove duplicate entry in build_cfg_template() switch statement
        • +
      • [PHPBB3-12903] - Remove unused method in phpBB/phpbb/extension/metadata_manager.php
        • +
      • [PHPBB3-12908] - Fix broken operator assignment in increment.php
        • +
      • [PHPBB3-12909] - Use correct lang vars in cli extension enable
        • +
      • [PHPBB3-12910] - Profile fields: Two "simple text field" in dropdown menu
        • +
      • [PHPBB3-12912] - Undefined index when adding logs from extensions
        • +
      • [PHPBB3-12918] - Functional Tests Suite does not run on its own
        • +
      • [PHPBB3-12919] - Allow using class names as module identifier for extensions
        • +
      • [PHPBB3-12922] - Posts per page in MCP should have a minimum value of zero
        • +
      • [PHPBB3-12931] - General error on user registration when domain name is not set
        • +
      • [PHPBB3-12932] - Easy support of non-gregorian calendars
        • +
      • [PHPBB3-12937] - Without config file, extract($phpbb_config_php_file->get_all()); breaks
        • +
      • [PHPBB3-12938] - Board floods "store"-directory with packed attachments
        • +
      • [PHPBB3-12940] - Unused 'use' statements in download/file.php
        • +
      • [PHPBB3-12950] - Functional tests can not be run anymore if another language is present
        • +
      • [PHPBB3-12954] - Nginx setup on travis returns wrong SCRIPT_NAME info
        • +
      • [PHPBB3-12956] - Unknown column 'field_is_contact' in 'field list'
        • +
      • [PHPBB3-12964] - Undefined $row in download/file.php
        • +
      • [PHPBB3-12967] - Undefined variable: phpbb_dispatcher in mcp_queue.php
        • +
      • [PHPBB3-12970] - chema.json is not up to date with migration files
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-9165] - Extend template loop to allow iteration step modification
        • +
      • [PHPBB3-10073] - Contact page
        • +
      • [PHPBB3-12051] - Optimise Composer Autoloader on Build
        • +
      • [PHPBB3-12560] - Add methods to set upload and temp paths in Plupload class
        • +
      • [PHPBB3-12656] - Translate existing CLI commands
        • +
      • [PHPBB3-12663] - Extract Command Line Interface language strings into their own file.
        • +
      • [PHPBB3-12671] - Possibility to use NOT LIKE expression
        • +
      • [PHPBB3-12693] - Add a travis test that checks file permissions
        • +
      • [PHPBB3-12738] - Move related code from functions_posting into remove_post_from_statistic()
        • +
      • [PHPBB3-12778] - The automatic updater should have an option to automatically delete removed files during update
        • +
      • [PHPBB3-12828] - Add includes/ucp/ucp_prefs.php common core event to allow additional actions before the page load
        • +
      • [PHPBB3-12832] - Add footer links to the Quick Links menu
        • +
      • [PHPBB3-12836] - [Event] - core.functions.redirect
        • +
      • [PHPBB3-12841] - Allow extensions to position new config vars in an array
        • +
      • [PHPBB3-12847] - Allow extensions to define if they can be enabled
        • +
      • [PHPBB3-12857] - Add template events overall_header_breadcrumbs_before/after
        • +
      • [PHPBB3-12864] - Have an EVENT tag after STYLESHEETS in overall_header
        • +
      • [PHPBB3-12871] - Add PHPBB_DISPLAY_LOAD_TIME constant to config.php on installation
        • +
      • [PHPBB3-12872] - Add poster_id to viewtopic_modify_post_row
        • +
      • [PHPBB3-12884] - Add core event to the function upload_attachment()
        • +
      • [PHPBB3-12892] - S_NUM_ROWS does not scale
        • +
      • [PHPBB3-12896] - Add event in acp_main to allow php checks for admin notices
        • +
      • [PHPBB3-12906] - Add rel="help" to FAQ link
        • +
      • [PHPBB3-12913] - Add more parameters to core.submit_post_end event
        • +
      • [PHPBB3-12942] - Add core.add_form_key core event
        • +
      • [PHPBB3-12944] - Add core.login_forum_box core event
        • +
      • [PHPBB3-12953] - Page title not updated when notifications are marked as read
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-12800] - [Event] - Create core.functions_display.display_user_activity.actives_after
        • +
      • [PHPBB3-12801] - [Event] - core.functions_posting.load_drafts_draft_list_results
        • +
      • [PHPBB3-12876] - [Event] - core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
        • +
      • [PHPBB3-12880] - [Event] - core.mcp_queue_!is_topics_query_before
        • +
      • [PHPBB3-12927] - [Event] - core.mcp_queue_get_posts2_query_before
        • +
      +

      Task

      +
        +
      • [PHPBB3-10404] - Remove create_function from includes/acp/auth.php
        • +
      • [PHPBB3-12557] - Fix doc block errors found by Sami
        • +
      • [PHPBB3-12826] - Investigate "catch (Exception"
        • +
      • [PHPBB3-12860] - Add template events to mcp_ban.html
        • +
      • [PHPBB3-12861] - Add event before assigning the posts to the template
        • +
      • [PHPBB3-12917] - Move commit check and file executable checks to 5.3.3 build on travis
        • +
      • [PHPBB3-12920] - Create composer installable app and core packages with subtree split
        • +
      • [PHPBB3-12941] - Check for Sami documentation errors on Travis CI
        • +
      • [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

      Bug

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

      1.ii. Changes since 3.1.0-b4

      +

      1.iii. Changes since 3.1.0-b4

      Bug

        @@ -286,7 +411,7 @@
      -

      1.iii. Changes since 3.1.0-b3

      +

      1.iv. Changes since 3.1.0-b3

      Bug

        @@ -393,7 +518,7 @@
      -

      1.iv. Changes since 3.1.0-b2

      +

      1.v. Changes since 3.1.0-b2

      Bug

        @@ -558,7 +683,7 @@
      -

      1.v. Changes since 3.1.0-b1

      +

      1.vi. Changes since 3.1.0-b1

      Bug

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

      1.vi. Changes since 3.1.0-a3

      +

      1.vii. Changes since 3.1.0-a3

      Bug

        @@ -773,7 +898,7 @@
      -

      1.vii. Changes since 3.1.0-a2

      +

      1.viii. Changes since 3.1.0-a2

      Bug

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

      1.viii. Changes since 3.1.0-a1

      +

      1.ix. Changes since 3.1.0-a1

      Bug

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

      1.ix. Changes since 3.0.x

      +

      1.x. Changes since 3.0.x

      Bug

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

      1.x. Changes since 3.0.11

      +

      1.xi. Changes since 3.0.11

      Bug

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

      1.xi. Changes since 3.0.10

      +

      1.xii. Changes since 3.0.10

      Bug

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

      1.xii. Changes since 3.0.9

      +

      1.xiii. Changes since 3.0.9

      Bug

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

      1.xiii. Changes since 3.0.8

      +

      1.xiv. Changes since 3.0.8

      Bug

      @@ -2422,7 +2547,7 @@ -

      1.xiv. Changes since 3.0.7-PL1

      +

      1.xv. Changes since 3.0.7-PL1

      Security

        @@ -2880,13 +3005,13 @@
      -

      1.xv. Changes since 3.0.7

      +

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

      +

      1.xvii. Changes since 3.0.6

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

      1.xvii. Changes since 3.0.5

      +

      1.xviii. Changes since 3.0.5

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

      1.xviii. Changes since 3.0.4

      +

      1.xix. Changes since 3.0.4

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

      1.xix. Changes since 3.0.3

      +

      1.xx. Changes since 3.0.3

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

      1.xx. Changes since 3.0.2

      +

      1.xxi. Changes since 3.0.2

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

      +

      1.xxii. Changes since 3.0.1

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

      1.xxii. Changes since 3.0.0

      +

      1.xxiii. Changes since 3.0.0

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

      1.xxiii. Changes since 3.0.RC8

      +

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

      1.xxiv. Changes since 3.0.RC7

      +

      1.xxv. Changes since 3.0.RC7

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

      1.xxv. Changes since 3.0.RC6

      +

      1.xxvi. Changes since 3.0.RC6

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

      1.xxvi. Changes since 3.0.RC5

      +

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

      1.xxvii. Changes since 3.0.RC4

      +

      1.xxviii. Changes since 3.0.RC4

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

      1.xxviii. Changes since 3.0.RC3

      +

      1.xxix. Changes since 3.0.RC3

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

      1.xxix. Changes since 3.0.RC2

      +

      1.xxx. Changes since 3.0.RC2

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

      1.xxx. Changes since 3.0.RC1

      +

      1.xxxi. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index cd4e19bf1d..0eac2e9417 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-RC3-dev'); +define('PHPBB_VERSION', '3.1.0-RC4-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 696075b07c..de0cccd234 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-RC2', + 'phpbb_version' => '3.1.0-RC3', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5589e10243..37e1c8de50 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-RC3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC4-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'); diff --git a/phpBB/phpbb/db/migration/data/v310/rc3.php b/phpBB/phpbb/db/migration/data/v310/rc3.php new file mode 100644 index 0000000000..0e6a452251 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc3.php @@ -0,0 +1,35 @@ + +* @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 rc3 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc2', + '\phpbb\db\migration\data\v310\captcha_plugins', + '\phpbb\db\migration\data\v310\rename_too_long_indexes', + '\phpbb\db\migration\data\v310\search_type', + '\phpbb\db\migration\data\v310\topic_sort_username', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC3')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 520b1f0e98..aea59021d6 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-RC2 -phpbb_version = 3.1.0-RC2 +style_version = 3.1.0-RC3 +phpbb_version = 3.1.0-RC3 # Defining a different template bitfield # template_bitfield = lNg=