diff --git a/build/build.xml b/build/build.xml index 98da9f7c04..550e7c3b6b 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 48910db5c1..d5dfa0b872 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.3.10
    • Changes since 3.3.10-RC1
    • Changes since 3.3.9
    • Changes since 3.3.9-RC1
      • @@ -166,6 +167,73 @@
      +

      Changes since 3.3.10

      +

      Bug

      +
        +
      • [PHPBB3-8777] - Users can be removed from all groups leaving no default group
        • +
      • [PHPBB3-11184] - ACP purports to allow editing of Founder admin permissions
        • +
      • [PHPBB3-12785] - Redirection of URI are calculated using PHP_SELF
        • +
      • [PHPBB3-13276] - INCLUDEJS and INCLUDECSS do not obey PHPBB_USE_BOARD_URL_PATH
        • +
      • [PHPBB3-13364] - Index Subject not updated after moderation
        • +
      • [PHPBB3-15129] - Wrong Installation guide link
        • +
      • [PHPBB3-16796] - misalignment on index and viewforum for topics and posts titles
        • +
      • [PHPBB3-16877] - OAuth account linking throws a PHP error - PHP 8
        • +
      • [PHPBB3-17004] - Pagination doesn't not show up in UCP > Front Page
        • +
      • [PHPBB3-17040] - bidi.css is loaded when viewing LTR print view pages
        • +
      • [PHPBB3-17041] - RTL Pagination Dropdown Arrow Faces The Wrong Way
        • +
      • [PHPBB3-17042] - Group Description With BBCode List Breaks Layout
        • +
      • [PHPBB3-17043] - Remove Duplicate CP Rule From bidi.css
        • +
      • [PHPBB3-17045] - UCP attachments list page top and bottom pagination counts language strings and font size are different
        • +
      • [PHPBB3-17046] - IE tweaks in simple_header should be included the same as in overall_header
        • +
      • [PHPBB3-17053] - sql_freeresult not working for mysqli & PHP 8
        • +
      • [PHPBB3-17076] - Signature length limit bug
        • +
      • [PHPBB3-17086] - phpBB / Codespaces support
        • +
      • [PHPBB3-17089] - Warning users without post causes PHP warning
        • +
      • [PHPBB3-17097] - PHP 8.2 Deprecations
        • +
      • [PHPBB3-17098] - body class {S_CONTENT_DIRECTION} is missing in ucp_pm_viewmessage_print.html
        • +
      • [PHPBB3-17107] - Who is online incorectly reports Forum location when replying/quoting
        • +
      • [PHPBB3-17115] - PHP warning with native search backend if query ends with a space followed by hyphen
        • +
      • [PHPBB3-17126] - Filename in instructions about running all tests does not exist
        • +
      • [PHPBB3-17127] - Guest users stats got purged when resetting password
        • +
      • [PHPBB3-17129] - Youtube profile field not up to date in new installations
        • +
      • [PHPBB3-17132] - Missing language variable leads to PHP error in convertor
        • +
      • [PHPBB3-17137] - Attachments can be deleted after end of post editing or deletion time
        • +
      • [PHPBB3-17139] - PHP fatal error while updating with advanced update package
        • +
      • [PHPBB3-17140] - Required parameter phpbb_root_path missing in local_url_bbcode migration
        • +
      • [PHPBB3-17141] - Empty referrer may result in PHP error in get_web_root_path()
        • +
      • [PHPBB3-17142] - Installation errors when using MSSQL+ IIS + PHP 8.2
        • +
      • [PHPBB3-17145] - Field 'pf_phpbb_occupation' doesn't have a default value
        • +
      • [PHPBB3-17146] - Undefined array key in notifications code
        • +
      • [PHPBB3-17148] - phpBB3.3.10 Setup does not support PostgreSQL 8.3
        • +
      • [PHPBB3-17150] - Forum Image Breaks Layout If Big Image Used - (Forum List Forum Image)
        • +
      • [PHPBB3-17160] - Missing 'Mark' Column Header On MCP Front Page
        • +
      • [PHPBB3-17171] - Remove non functional responsive placeholder text rules in responsive.css
        • +
      • [PHPBB3-17172] - Hovering over a forum link / subforum link shows 'No unread posts' on the tooltip
        • +
      • [PHPBB3-17189] - Installer permission handling on PHP 8.2
        • +
      • [PHPBB3-17194] - Php version in vagrant configuration is not set correctly
        • +
      • [PHPBB3-17198] - Gravatar requires https by default
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-8071] - DBAL function "sql_nextid" - name is misleading
        • +
      • [PHPBB3-11765] - short_ipv6() doesn't expect IPv4 embedded IPv6 addresses
        • +
      • [PHPBB3-12904] - Required custom profile fields and asterisk
        • +
      • [PHPBB3-13399] - Problem with plurals - 'CHARACTERS'
        • +
      • [PHPBB3-15973] - Canonical for the index page
        • +
      • [PHPBB3-16913] - Add Search Index Progress Bar with Stats
        • +
      • [PHPBB3-17025] - Move post destination topic field should not be populated with a zero
        • +
      • [PHPBB3-17125] - Message Editor layout Broken in Latest Safari
        • +
      • [PHPBB3-17128] - Link to PHP date() function
        • +
      • [PHPBB3-17152] - Add template event to viewtopic_body.html
        • +
      • [PHPBB3-17188] - Condition to check if a utf8 string is malformed is wrong
        • +
      +

      Task

      +
        +
      • [PHPBB3-17116] - Useless duplicate conditions in ucp_pm_history.html
        • +
      • [PHPBB3-17149] - Update authors and pull request template
        • +
      • [PHPBB3-17154] - Update composer and dependencies to latest versions
        • +
      +

      Changes since 3.3.10-RC1

      Bug

        diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 4758e89a93..0a5eec4471 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -550,7 +550,7 @@ class acp_icons trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak))) + if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . utf8_basename($pak)))) { trigger_error($user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING); } @@ -654,7 +654,7 @@ class acp_icons { $replace_sql = ($mode == 'smilies') ? $code : $img; $sql = array( - $fields . '_url' => $img, + $fields . '_url' => utf8_substr(rawurlencode($img), 0, 50), $fields . '_height' => (int) $height, $fields . '_width' => (int) $width, 'display_on_posting' => (int) $display_on_posting, @@ -676,7 +676,7 @@ class acp_icons ++$order; $sql = array( - $fields . '_url' => $img, + $fields . '_url' => utf8_substr(rawurlencode($img), 0, 50), $fields . '_height' => (int) $height, $fields . '_width' => (int) $width, $fields . '_order' => (int) $order, diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index d7d590395c..558f25b045 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.11-dev'); +@define('PHPBB_VERSION', '3.3.11'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 50550fb479..5f7a87f74b 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -300,7 +300,7 @@ class ucp_register if ($config['max_reg_attempts'] && $captcha->get_attempt_count() > $config['max_reg_attempts']) { - $error[] = $user->lang['TOO_MANY_REGISTERS']; + trigger_error('TOO_MANY_REGISTERS'); } } diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 0816fa72d5..54d7c7f8d6 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.10', + 'phpbb_version' => '3.3.11', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 008b06716a..16c109c1cb 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.10'); +define('PHPBB_VERSION', '3.3.11'); $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 48270b4a1e..ef6aead376 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.11-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.11'); 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/v3311.php b/phpBB/phpbb/db/migration/data/v33x/v3311.php new file mode 100644 index 0000000000..d684dc746a --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3311.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 v3311 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.11', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\profilefields_update', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.11']], + ]; + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8f66de1121..8d7af0133e 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.10 -phpbb_version = 3.3.10 +style_version = 3.3.11 +phpbb_version = 3.3.11 # Defining a different template bitfield # template_bitfield = //g=