diff --git a/build/build.xml b/build/build.xml index c1a7b274b9..8dbe2f5f21 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 8b20e374b1..67aad9177e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.12
    • Changes since 3.3.12-RC1
    • Changes since 3.3.11
    • Changes since 3.3.10
      • @@ -169,6 +170,55 @@
      +

      Changes since 3.3.12

      +

      Bug

      +
        +
      • [PHPBB-13916] - Cancelling save draft removes previous notify setting on posting page
        • +
      • [PHPBB-14454] - Accessing ACP modules while testing user permissions returns a General Error
        • +
      • [PHPBB-15043] - Searching no longer working in 3.2.0
        • +
      • [PHPBB-15576] - PM subject truncated to shorter length than maxlength
        • +
      • [PHPBB-16213] - vendor and phpbb folders should have .htaccess files
        • +
      • [PHPBB-16907] - "phpbb" value in "hiddenSegments" blocks client requests for extensions in IIS
        • +
      • [PHPBB-17109] - Users without the "Can use signature" permission should not see checkboxes for signature
        • +
      • [PHPBB-17175] - Breadcrumbs show wrong forum and topic when using 'email topic'
        • +
      • [PHPBB-17301] - Wrong length parameter for fread in phpbb/cache/driver/file.php can lead to unusable forum
        • +
      • [PHPBB-17327] - Fix linting issue in console user add command
        • +
      • [PHPBB-17332] - New permission copied from existing permission ignores permission set options
        • +
      • [PHPBB-17337] - Transaction begin is missing from mysqli driver
        • +
      • [PHPBB-17338] - Incorrect members list sorting by user_last_visit
        • +
      • [PHPBB-17351] - phpBB2 password hashes incorrectly handled during rehash cron
        • +
      • [PHPBB-17352] - Long rank titles push other profile details below
        • +
      • [PHPBB-17353] - Gravatar avatar src is not image src
        • +
      • [PHPBB-17356] - Errors hidden by at are being displayed in PHP 8 or newer
        • +
      • [PHPBB-17358] - Redis cache never expires with the TTL of 0
        • +
      • [PHPBB-17362] - Missing declaration of property in extension manager
        • +
      • [PHPBB-17365] - Enforce the search word limit on queries containing operators without white space
        • +
      • [PHPBB-17366] - Captcha disappears on error message from registration & posting
        • +
      • [PHPBB-17369] - Permanently deleting soft-deleted topics returns incorrect forum in redirect link
        • +
      • [PHPBB-17370] - Deleting Cookies on FAQ/other pages
        • +
      • [PHPBB-17374] - ACP - Maintenance - Logs: Deleting Error / Bug
        • +
      • [PHPBB-17375] - User lastvisit gets updated too often in session garbage collection
        • +
      +

      Improvement

      +
        +
      • [PHPBB-16553] - Disapproving a reported post causes a "Module not accessible" error
        • +
      • [PHPBB-17308] - Rename tracker project key to PHPBB-
        • +
      • [PHPBB-17315] - Add new template events to group
        • +
      • [PHPBB-17316] - Add template events to ucp_groups_manage
        • +
      • [PHPBB-17317] - Update button text and make it more readable
        • +
      • [PHPBB-17325] - Show explicit message for "Re-Check version" if installed version is still up to date
        • +
      • [PHPBB-17340] - Update composer to 2.7.7
        • +
      • [PHPBB-17342] - Add PHP 8.4-dev tests to GitHub Actions
        • +
      • [PHPBB-17347] - Support deleting users by ID via console
        • +
      • [PHPBB-17350] - Add user IP address to log when installing extensions on fresh installs
        • +
      • [PHPBB-17355] - Update gravatar hash to sha256
        • +
      +

      Task

      +
        +
      • [PHPBB-13933] - Update tokens' definitions in acp_bbcodes
        • +
      • [PHPBB-16890] - Edit the config sample files and web.config to deny access to the "config" directory
        • +
      +

      Changes since 3.3.12-RC1

      Bug

        diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e7059af80d..5576aeb0b0 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.3.13-dev'); +@define('PHPBB_VERSION', '3.3.13-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7f9449609e..7a02946f77 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.3.12', + 'phpbb_version' => '3.3.13', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 07b13ddda0..95802ddf17 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.3.12'); +define('PHPBB_VERSION', '3.3.13-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 674b35a17e..714ce05d06 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock 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.3.13-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-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/v33x/v3313rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php new file mode 100644 index 0000000000..4481a53821 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php @@ -0,0 +1,36 @@ + + * @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\v33x; + +class v3313rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.13-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3312', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.13-RC1']], + ]; + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 3f6f8a35d6..0b16bfde55 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.3.12 -phpbb_version = 3.3.12 +style_version = 3.3.13 +phpbb_version = 3.3.13 # Defining a different template bitfield # template_bitfield = //g= diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index e866175bf7..0171d646da 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -10,7 +10,7 @@ @import url("normalize.css?hash=48eb3f89"); @import url("base.css?hash=7c5543be"); @import url("utilities.css?hash=d8f72c42"); -@import url("common.css?hash=a9741ba1"); +@import url("common.css?hash=843d5d5f"); @import url("links.css?hash=18286e16"); @import url("content.css?hash=d0e24377"); @import url("buttons.css?hash=56f0d25f"); @@ -18,4 +18,4 @@ @import url("forms.css?hash=9016b55c"); @import url("icons.css?hash=64da33ce"); @import url("colours.css?hash=fcb2f289"); -@import url("responsive.css?hash=91525545"); +@import url("responsive.css?hash=c9d32cba");