<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13417] trunk: Raise WordPress required version to 5.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13417">13417</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13417","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-10 04:01:49 +0000 (Fri, 10 Feb 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Raise WordPress required version to 5.8
Closes https://github.com/buddypress/buddypress/pull/61
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8822">#8822</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgithubworkflowsunittestsyml">trunk/.github/workflows/unit-tests.yml</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
<li><a href="#trunksrcbpcorebpcoreattachmentsphp">trunk/src/bp-core/bp-core-attachments.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpcorebpcorewidgetsphp">trunk/src/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunksrcbploaderphp">trunk/src/bp-loader.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreavatarsphp">trunk/tests/phpunit/testcases/core/avatars.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsphp">trunk/tests/phpunit/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgithubworkflowsunittestsyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.github/workflows/unit-tests.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.github/workflows/unit-tests.yml 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/.github/workflows/unit-tests.yml 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> - php: '7.4'
</span><span class="cx" style="display: block; padding: 0 10px"> wp_version: '6.1'
</span><span class="cx" style="display: block; padding: 0 10px"> - php: '7.4'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_version: '5.7'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_version: '5.8'
</ins><span class="cx" style="display: block; padding: 0 10px"> env:
</span><span class="cx" style="display: block; padding: 0 10px"> WP_ENV_PHP_VERSION: ${{ matrix.php }}
</span><span class="cx" style="display: block; padding: 0 10px"> WP_VERSION: ${{ matrix.wp_version }}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> - name: Adapt WP PHPUnit version for WP < 6.1
</span><span class="cx" style="display: block; padding: 0 10px"> run: |
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if [ ${{ env.WP_VERSION }} == '5.7' ]; then
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if [ ${{ env.WP_VERSION }} == '5.8' ]; then
</ins><span class="cx" style="display: block; padding: 0 10px"> composer require wp-phpunit/wp-phpunit:6.0 --dev --ignore-platform-reqs
</span><span class="cx" style="display: block; padding: 0 10px"> fi
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/bp-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/bp-loader.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/bp-loader.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Text Domain: buddypress
</span><span class="cx" style="display: block; padding: 0 10px"> * Domain Path: /bp-languages/
</span><span class="cx" style="display: block; padding: 0 10px"> * Requires PHP: 5.6
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Requires at least: 5.7
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Requires at least: 5.8
</ins><span class="cx" style="display: block; padding: 0 10px"> * Version: 12.0.0-alpha
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-attachments.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/src/bp-core/bp-core-attachments.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,10 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_attachments_get_allowed_types( $type = 'avatar' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Defaults to BuddyPress supported image extensions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
- if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
- $exts[] = 'webp';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Avatar and cover image are images.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'image' !== $type && 'avatar' !== $type && 'cover_image' !== $type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +783,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if WebP images can be edited.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_is_running_wp( '5.8.0', '>=' ) && ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $defaults['webp_upload_error'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/src/bp-core/bp-core-template.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3888,7 +3888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'block' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $block_name && bp_is_running_wp( '5.8.0', '>=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $block_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget_blocks = get_option( 'widget_block', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebars = wp_get_sidebars_widgets();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-widgets.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/src/bp-core/bp-core-widgets.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,10 +19,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_retain_legacy_widgets() {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_supports = current_theme_supports( 'widgets-block-editor' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_supports = bp_is_running_wp( '5.8.0' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/widgets.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_widgets_enabled = $theme_supports && apply_filters( 'use_widgets_block_editor', $wp_supports );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_widgets_enabled = $theme_supports && apply_filters( 'use_widgets_block_editor', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retain_legacy_widgets = true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $block_widgets_enabled ) {
</span></span></pre></div>
<a id="trunksrcbploaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-loader.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/src/bp-loader.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Text Domain: buddypress
</span><span class="cx" style="display: block; padding: 0 10px"> * Domain Path: /bp-languages/
</span><span class="cx" style="display: block; padding: 0 10px"> * Requires PHP: 5.6
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Requires at least: 5.7
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Requires at least: 5.8
</ins><span class="cx" style="display: block; padding: 0 10px"> * Version: 12.0.0-alpha
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/avatars.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/tests/phpunit/testcases/core/avatars.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,16 +5,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Tests_Avatars extends BP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> private $params = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $allowed_image_types = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
- protected $allowed_image_mimes = array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $allowed_image_types = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
+ protected $allowed_image_mimes = array( 'image/jpeg', 'image/jpeg', 'image/jpeg', 'image/gif', 'image/png', 'image/webp' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
- $this->allowed_image_types[] = 'webp';
- $this->allowed_image_mimes[] = 'image/webp';
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private function clean_existing_avatars( $type = 'user' ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions.php 2023-02-10 03:48:32 UTC (rev 13416)
+++ trunk/tests/phpunit/testcases/core/functions.php 2023-02-10 04:01:49 UTC (rev 13417)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,10 +784,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_attachments
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_attachments_get_allowed_types() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
- if ( bp_is_running_wp( '5.8.0', '>=' ) ) {
- $supported[] = 'webp';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $supported = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = bp_attachments_get_allowed_types( 'avatar' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $supported, $avatar );
</span></span></pre>
</div>
</div>
</body>
</html>