diff --git a/build/build.xml b/build/build.xml index c2e2aea1d8..01698bf027 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 1f9f36fef1..266a65a9c0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.0
    • Changes since 3.2.0-RC1
    • Changes since 3.2.0-b2
    • Changes since 3.2.0-b1
      • @@ -125,6 +126,113 @@
      +

      Changes since 3.2.0

      +

      Bug

      +
        +
      • [PHPBB3-7336] - Words in new topic title aren't found by search after topic is split
        • +
      • [PHPBB3-11076] - Update notification in ACP for minimum PHP version missing essential information
        • +
      • [PHPBB3-11611] - setup_github_network.php no longer creates a repository
        • +
      • [PHPBB3-13250] - File cache does not write entries starting with _ and containing a slash
        • +
      • [PHPBB3-14732] - Update/remove PHP Code syntax highlighting references
        • +
      • [PHPBB3-14790] - Nested color/list BBCode is not parsed correctly
        • +
      • [PHPBB3-14938] - Inconsistent data results from ext_mgr->all_available() vs ext_mgr->is_available()
        • +
      • [PHPBB3-14967] - Cookie Notice
        • +
      • [PHPBB3-14971] - PHP 7.1 warning on pagination
        • +
      • [PHPBB3-14975] - incorrect RTL style appearance
        • +
      • [PHPBB3-14984] - wrong arrow direction in PM inbox
        • +
      • [PHPBB3-14985] - Plain text is stored as HTML and not decoded before usage
        • +
      • [PHPBB3-14989] - url bbcode does not support irc protocol
        • +
      • [PHPBB3-14992] - User notifications table allowing duplicate entries
        • +
      • [PHPBB3-14999] - Next PM icon pointing in wrong direction
        • +
      • [PHPBB3-15002] - Topic icons not showing in search results
        • +
      • [PHPBB3-15003] - When using mark all, disabled check boxes should not become checked
        • +
      • [PHPBB3-15006] - Permission inheritance with checkbox not working
        • +
      • [PHPBB3-15008] - Disable emoji when smilies are disabled
        • +
      • [PHPBB3-15010] - Crash on user profile custom field
        • +
      • [PHPBB3-15011] - Error not checked on metadata load failure
        • +
      • [PHPBB3-15012] - Invalid constructor in FTP file updater
        • +
      • [PHPBB3-15015] - phpbb 3.2.0 install error in the board-wide emails description...
        • +
      • [PHPBB3-15016] - Smilies that contain some characters cause an exception to be thrown
        • +
      • [PHPBB3-15023] - Undo and properly fix post row paging
        • +
      • [PHPBB3-15025] - Use SSL in version check for extension
        • +
      • [PHPBB3-15035] - Add phpinfo.php to 3.2.x install directory
        • +
      • [PHPBB3-15036] - Failure at board setup in functional tests with install_config present
        • +
      • [PHPBB3-15044] - Installation does not create search index
        • +
      • [PHPBB3-15047] - Error migrating from 3.0.12 to 3.2. MS SQL Server
        • +
      • [PHPBB3-15050] - Updater incorrectly adds files when new file already exists
        • +
      • [PHPBB3-15056] - Mark forums read does not update subforum icons
        • +
      • [PHPBB3-15058] - At new feature release phpBB's CSS files should carry information for cache busting
        • +
      • [PHPBB3-15062] - Update to Rhea version number the CSS files
        • +
      • [PHPBB3-15079] - MySql Error when saving draft with Emoji
        • +
      • [PHPBB3-15083] - emoji's not always size constrained
        • +
      • [PHPBB3-15084] - Wrong order of breadcrumbs in module management
        • +
      • [PHPBB3-15090] - Missing acp_send_statistics -> Upgrading to 3.2.0 fails for phpBBs < 3.0.6-rc1
        • +
      • [PHPBB3-15102] - Missing parameter calling version_check
        • +
      • [PHPBB3-15103] - JPEG dimensions undetectable when JFIF header is missing
        • +
      • [PHPBB3-15118] - HTML error/typo in jumpbox.html
        • +
      • [PHPBB3-15124] - Navbar icon titles don't get hidden in responsive view
        • +
      • [PHPBB3-15126] - Incorrect links with clever quotes
        • +
      • [PHPBB3-15135] - Undefined $user in metadata manager
        • +
      • [PHPBB3-15137] - Global Announcements shouldn't always be never ending
        • +
      • [PHPBB3-15150] - Yabber SSL/TLS certification
        • +
      • [PHPBB3-15152] - Update Font Awesome
        • +
      • [PHPBB3-15158] - Facebook OAuth login results in fatal error
        • +
      • [PHPBB3-15163] - Braces in smilies "emotion" are not treated as literals
        • +
      • [PHPBB3-15173] - Resizing the posting editor's text area lags
        • +
      • [PHPBB3-15180] - Container broken because of template.twig.environment changes
        • +
      • [PHPBB3-15186] - The force_delete_allowed flag does not affect actual posts deletion ability
        • +
      • [PHPBB3-15187] - ACP Template files not purged during Extension Enable
        • +
      • [PHPBB3-15198] - Fix phpBB and PHP version info displayed in the ACP
        • +
      • [PHPBB3-15202] - Should not be possible to disable available extensions
        • +
      • [PHPBB3-15212] - Code box has double horizontal scrollbars
        • +
      • [PHPBB3-15217] - Allow extension to overwrite user::format_date()
        • +
      • [PHPBB3-15221] - missing commas in language/en/install.php
        • +
      • [PHPBB3-15222] - Typo in generate_text_for_display_test.php
        • +
      • [PHPBB3-15243] - Check permissions before installing with SQLite
        • +
      • [PHPBB3-15246] - Memcache driver incorrectly handles Unix sockets
        • +
      • [PHPBB3-15248] - Event core.modify_posting_auth does not honor its parameters
        • +
      • [PHPBB3-15252] - Wrapping poll title and options text by extra <t> tags if edited a topic by user having no f_poll permission
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-13603] - New event upon index_body_online_block_after
        • +
      • [PHPBB3-14557] - Simplify updating overloaded events for extensions
        • +
      • [PHPBB3-14849] - Add ACP extension event
        • +
      • [PHPBB3-14928] - Users will not understand the phrase '"%s" is not a valid stability.'
        • +
      • [PHPBB3-14973] - BC break with the rename of db/tools.php
        • +
      • [PHPBB3-14974] - Cookie notice link not configurable but links to english website
        • +
      • [PHPBB3-15037] - Make imageset retina capable
        • +
      • [PHPBB3-15068] - Add ability to retrieve template vars from the template object
        • +
      • [PHPBB3-15097] - Board statistics page should show PHP version
        • +
      • [PHPBB3-15123] - Check if extension was enabled/disabled before enable or disable
        • +
      • [PHPBB3-15142] - Extension Version Check Should Support Branches
        • +
      • [PHPBB3-15157] - Fix lack of proper font support
        • +
      • [PHPBB3-15176] - Add setting for the maximum number of posts a user must have to have his activity shown in profile
        • +
      • [PHPBB3-15199] - Add core event to the function send() in the messenger
        • +
      • [PHPBB3-15200] - Allow extensions using custom templates for help/faq controllers
        • +
      • [PHPBB3-15205] - Add template events to forumlist_body.html
        • +
      • [PHPBB3-15219] - Add cron to update passwords hashes to bcrypt
        • +
      • [PHPBB3-15226] - Add index for latest topics query in feeds
        • +
      • [PHPBB3-15227] - Remove unused code in startup
        • +
      • [PHPBB3-15237] - Unguarded includes functions_user
        • +
      • [PHPBB3-15238] - Add console command to fix left/right IDs for the forums and modules
        • +
      • [PHPBB3-15241] - Add ACP template event acp_profile_contact_last
        • +
      • [PHPBB3-15250] - Add core event to MCP at the end of merge_posts
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-13730] - [PHP] - core.delete_post_end
        • +
      • [PHPBB3-14498] - Not possible to deactivate display of "who is online" and birthdays for guests
        • +
      +

      Task

      +
        +
      • [PHPBB3-15040] - Update s9e\TextFormatter to 0.9.1
        • +
      • [PHPBB3-15045] - Fix missing incorrect constructor for user object in version_test
        • +
      • [PHPBB3-15086] - Replace quote.gif with fontawesome icon
        • +
      • [PHPBB3-15125] - Remove the function play_qt_file in forum_fn.js
        • +
      • [PHPBB3-15144] - Bug - MCP Multiple attachments icon display
        • +
      +

      Changes since 3.2.0-RC1

      Bug

        diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 440064140c..c5e04802fc 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.1-dev'); +@define('PHPBB_VERSION', '3.2.1-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 73d4b6b1ff..aff9eef55b 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', + 'phpbb_version' => '3.2.1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index c67766e8a1..afc70f3302 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'); +define('PHPBB_VERSION', '3.2.1-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 263200d8ff..b862a77260 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,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.1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.1-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/v32x/v321rc1.php b/phpBB/phpbb/db/migration/data/v32x/v321rc1.php new file mode 100644 index 0000000000..653a16f327 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/v321rc1.php @@ -0,0 +1,39 @@ + +* @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\v32x; + +class v321rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.2.1-RC1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v320\v320', + '\phpbb\db\migration\data\v31x\v3111rc1', + '\phpbb\db\migration\data\v32x\load_user_activity_limit', + '\phpbb\db\migration\data\v32x\user_notifications_table_unique_index', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.1-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 725282036b..2deceef788 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 -phpbb_version = 3.2.0 +style_version = 3.2.1 +phpbb_version = 3.2.1 # Defining a different template bitfield # template_bitfield = lNg=