Ticket #8571: 8571.patch

.github/workflows/unit-tests.yml

@@ -18 +18 @@
             wp_version: '5.8'
           - php: '7.4'
             wp_version: '5.8'
+          - php: '7.4'
+            wp_version: '5.4'
     env:
       WP_ENV_PHP_VERSION: ${{ matrix.php }}
       WP_VERSION: ${{ matrix.wp_version }}

src/bp-blogs/bp-blogs-functions.php

@@ -574 +574 @@
  * Deletes the 'url' blogmeta for a site.
  *
  * Fires when a site's details are updated, which generally happens when
- * editing a site under "Network Admin > Sites". Prior to WP 4.9, the
- * correct hook was 'refresh_blog_details'; afterward, 'clean_site_cache'.
+ * editing a site under "Network Admin > Sites".
  *
  * @since 2.3.0
  *
@@ -584 +583 @@
 function bp_blogs_delete_url_blogmeta( $site_id = 0 ) {
         bp_blogs_delete_blogmeta( (int) $site_id, 'url' );
 }
-
-if ( bp_is_running_wp( '4.9.0' ) ) {
-        add_action( 'clean_site_cache', 'bp_blogs_delete_url_blogmeta' );
-} else {
-        add_action( 'refresh_blog_details', 'bp_blogs_delete_url_blogmeta' );
-}
+add_action( 'clean_site_cache', 'bp_blogs_delete_url_blogmeta' );
 
 /**
  * Record activity metadata about a published blog post.

src/bp-core/admin/js/hello.js

@@ -4 +4 @@
  *
  * @since 3.0.0
  */
-(function( $, bp ) {
+(function( $, wp ) {
         // Bail if not set
         if ( typeof bpHelloStrings === 'undefined' ) {
                 return;
@@ -79 +79 @@
 
                         $( '#TB_window' ).addClass( 'thickbox-loading' );
 
-                        bp.apiRequest( {
+                        wp.apiRequest( {
                                 url: anchor.data( 'endpoint' ),
                                 type: 'GET',
                                 beforeSend: function( xhr, settings ) {
@@ -118 +118 @@
         } );
 
         // Init modal after the screen's loaded.
-        $( document ).ready( function() {
+        $( function() {
                 bpHelloOpenModal();
         } );
 
-}( jQuery, window.bp || {} ) );
+}( jQuery, window.wp || {} ) );

src/bp-core/bp-core-functions.php

@@ -3270 +3270 @@
                 return false;
         }
 
-        // register_term_meta() was introduced in WP 4.9.8.
-        if ( ! bp_is_running_wp( '4.9.8' ) ) {
-                $args['object_subtype'] = $type_tax;
-
-                return register_meta( 'term', $meta_key, $args );
-        }
-
         return register_term_meta( $type_tax, $meta_key, $args );
 }
 
@@ -3684 +3677 @@
                 )
         );
 
-        if ( bp_is_running_wp( '4.9.6' ) ) {
-                $privacy_policy_url = get_privacy_policy_url();
-                if ( $privacy_policy_url ) {
-                        $footer_text[] = sprintf(
-                                '<a href="%s">%s</a>',
-                                esc_url( $privacy_policy_url ),
-                                esc_html__( 'Privacy Policy', 'buddypress' )
-                        );
-                }
+        $privacy_policy_url = get_privacy_policy_url();
+        if ( $privacy_policy_url ) {
+                $footer_text[] = sprintf(
+                        '<a href="%s">%s</a>',
+                        esc_url( $privacy_policy_url ),
+                        esc_html__( 'Privacy Policy', 'buddypress' )
+                );
         }
 
         $default_args = array(

src/bp-core/bp-core-rest-api.php

@@ -63 +63 @@
  * Register the jQuery.ajax wrapper for BP REST API requests.
  *
  * @since 5.0.0
+ * @deprecated 10.0.0
  */
 function bp_rest_api_register_request_script() {
         if ( ! bp_rest_api_is_available() ) {
                 return;
         }
 
-        $dependencies = array( 'jquery' );
-
-        // The wrapper for WP REST API requests was introduced in WordPress 4.9.0.
-        if ( wp_script_is( 'wp-api-request', 'registered' ) ) {
-                $dependencies = array( 'wp-api-request' );
-        }
-
         wp_register_script(
                 'bp-api-request',
                 sprintf( '%1$sbp-core/js/bp-api-request%2$s.js', buddypress()->plugin_url, bp_core_get_minified_asset_suffix() ),
-                $dependencies,
+                array( 'jquery', 'wp-api-request' ),
                 bp_get_version(),
                 true
         );
@@ -88 +82 @@
                 'bp-api-request',
                 'bpApiSettings',
                 array(
-                        'root'            => esc_url_raw( get_rest_url() ),
-                        'nonce'           => wp_create_nonce( 'wp_rest' ),
-                        'unexpectedError' => __( 'An unexpected error occured. Please try again.', 'buddypress' ),
+                        'root'              => esc_url_raw( get_rest_url() ),
+                        'nonce'             => wp_create_nonce( 'wp_rest' ),
+                        'unexpectedError'   => __( 'An unexpected error occured. Please try again.', 'buddypress' ),
+                        'deprecatedWarning' => __( 'The bp.apiRequest function is deprecated since BuddyPress 10.0.0, please use wp.apiRequest instead.', 'buddypress' ),
                 )
         );
 }

src/bp-core/bp-core-wpabstraction.php

@@ -308 +308 @@
         }
 }
 
-/**
- * Returns the name of the hook to use once a WordPress Site is inserted into the Database.
- *
- * WordPress 5.1.0 deprecated the `wpmu_new_blog` action. As BuddyPress is supporting WordPress back
- * to 4.9.0, this function makes sure we are using the new hook `wp_initialize_site` when the current
- * WordPress version is upper or equal to 5.1.0 and that we keep on using `wpmu_new_blog` for earlier
- * versions of WordPress.
- *
- * @since 6.0.0
- *
- * @return string The name of the hook to use.
- */
-function bp_insert_site_hook() {
-        $wp_hook = 'wpmu_new_blog';
-
-        if ( function_exists( 'wp_insert_site' ) ) {
-                $wp_hook = 'wp_initialize_site';
-        }
-
-        return $wp_hook;
-}
-
 /**
  * Catch the new site data for a later use.
  *
@@ -399 +377 @@
          */
         do_action( 'bp_insert_site', $site_id, $user_id, $domain, $path, $network_id, $meta );
 }
-add_action( bp_insert_site_hook(), 'bp_insert_site' );
-
-/**
- * Returns the name of the hook to use once a WordPress Site is deleted.
- *
- * WordPress 5.1.0 deprecated the `delete_blog` action. As BuddyPress is supporting WordPress back
- * to 4.9.0, this function makes sure we are using the new hook `wp_validate_site_deletion` when the
- * current WordPress version is upper or equal to 5.1.0 and that we keep on using `delete_blog` for
- * earlier versions of WordPress.
- *
- * @since 6.0.0
- *
- * @return string The name of the hook to use.
- */
-function bp_delete_site_hook() {
-        $wp_hook = 'delete_blog';
-
-        if ( function_exists( 'wp_delete_site' ) ) {
-                $wp_hook = 'wp_validate_site_deletion';
-        }
-
-        return $wp_hook;
-}
+add_action( 'wp_initialize_site', 'bp_insert_site' );
 
 /**
  * Makes sure the `bp_delete_site` hook is fired if site's deletion
@@ -471 +427 @@
          */
         do_action( 'bp_delete_site', $site_id, $drop );
 }
-add_action( bp_delete_site_hook(), 'bp_delete_site', 10, 2 );
-
-if ( ! function_exists( 'wp_parse_list' ) ) {
-        /**
-         * Cleans up an array, comma- or space-separated list of scalar values.
-         *
-         * As BuddyPress supports older WordPress versions than 5.1 (4.9 & 5.0),
-         * the BP REST API needs this function to be available.
-         *
-         * @since 7.0.0
-         *
-         * @param array|string $list List of values.
-         * @return array Sanitized array of values.
-         */
-        function wp_parse_list( $list ) {
-                if ( ! is_array( $list ) ) {
-                        return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
-                }
-
-                return $list;
-        }
-}
+add_action( 'wp_validate_site_deletion', 'bp_delete_site', 10, 2 );

src/bp-core/classes/class-bp-admin.php

@@ -573 +573 @@
          * @since 4.0.0
          */
         public function add_privacy_policy_content() {
-                // Nothing to do if we're running < WP 4.9.6.
-                if ( bp_is_running_wp( '4.9.6', '<' ) ) {
-                        return;
-                }
-
                 $suggested_text = '<strong class="privacy-policy-tutorial">' . esc_html__( 'Suggested text:', 'buddypress' ) . ' </strong>';
                 $content = '';
 
@@ -1213 +1208 @@
                         // 3.0
                         'bp-hello-js' => array(
                                 'file'         => "{$url}hello{$min}.js",
-                                'dependencies' => array( 'thickbox', 'bp-api-request' ),
+                                'dependencies' => array( 'thickbox', 'wp-api-request' ),
                                 'footer'       => true,
                         ),
                 ) );

src/bp-core/deprecated/10.0.php

@@ +1 @@
+<?php
+/**
+ * Deprecated functions.
+ *
+ * @package BuddyPress
+ * @deprecated 10.0.0
+ */
+
+// Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+}
+
+/**
+ * Returns the name of the hook to use once a WordPress Site is inserted into the Database.
+ *
+ * WordPress 5.1.0 deprecated the `wpmu_new_blog` action. As BuddyPress is supporting WordPress back
+ * to 4.9.0, this function makes sure we are using the new hook `wp_initialize_site` when the current
+ * WordPress version is upper or equal to 5.1.0 and that we keep on using `wpmu_new_blog` for earlier
+ * versions of WordPress.
+ *
+ * @since 6.0.0
+ * @deprecated 10.0.0
+ *
+ * @return string The name of the hook to use.
+ */
+function bp_insert_site_hook() {
+        _deprecated_function( __FUNCTION__, '10.0.0' );
+
+        $wp_hook = 'wpmu_new_blog';
+
+        if ( function_exists( 'wp_insert_site' ) ) {
+                $wp_hook = 'wp_initialize_site';
+        }
+
+        return $wp_hook;
+}
+
+/**
+ * Returns the name of the hook to use once a WordPress Site is deleted.
+ *
+ * WordPress 5.1.0 deprecated the `delete_blog` action. As BuddyPress is supporting WordPress back
+ * to 4.9.0, this function makes sure we are using the new hook `wp_validate_site_deletion` when the
+ * current WordPress version is upper or equal to 5.1.0 and that we keep on using `delete_blog` for
+ * earlier versions of WordPress.
+ *
+ * @since 6.0.0
+ * @deprecated 10.0.0
+ *
+ * @return string The name of the hook to use.
+ */
+function bp_delete_site_hook() {
+        _deprecated_function( __FUNCTION__, '10.0.0' );
+
+        $wp_hook = 'delete_blog';
+
+        if ( function_exists( 'wp_delete_site' ) ) {
+                $wp_hook = 'wp_validate_site_deletion';
+        }
+
+        return $wp_hook;
+}

src/bp-core/js/bp-api-request.js

@@ -2 +2 @@
  * jQuery.ajax wrapper for BP REST API requests.
  *
  * @since  5.0.0
+ * @deprecated 10.0.0
  * @output bp-core/js/bp-api-request.js
  */
 /* global bpApiSettings */
 window.bp = window.bp || {};
 
-( function( wp, bp, $ ) {
+( function( wp, bp ) {
     // Bail if not set.
     if ( typeof bpApiSettings === 'undefined' ) {
         return;
@@ -15 +16 @@
 
     bp.isRestEnabled = true;
 
-    // Polyfill wp.apiRequest if WordPress < 4.9.
+    // Polyfill wp.apiRequest.
     bp.apiRequest = function( options ) {
+                window.console.log( bpApiSettings.deprecatedWarning );
+
         var bpRequest;
 
         if ( ! options.dataType ) {
             options.dataType = 'json';
         }
 
-        // WordPress is >= 4.9.0.
-        if ( wp.apiRequest ) {
-            bpRequest = wp.apiRequest( options );
-
-        // WordPress is < 4.9.0.
-        } else {
-            var url = bpApiSettings.root;
-
-            if ( options.path ) {
-                url = url + options.path.replace( /^\//, '' );
-            }
-
-            if ( ! options.url ) {
-                options.url = url;
-            }
-
-            // Add The nonce only when needed.
-            if ( -1 !== options.url.indexOf( url ) ) {
-                options.beforeSend = function( xhr ) {
-                    xhr.setRequestHeader( 'X-WP-Nonce', bpApiSettings.nonce );
-                };
-            }
-
-            bpRequest = $.ajax( options );
-        }
+        bpRequest = wp.apiRequest( options );
 
         return bpRequest.then( null, function( result ) {
             var errorObject = {
@@ -66 +45 @@
         } );
     };
 
-} )( window.wp || {}, window.bp, jQuery );
+} )( window.wp || {}, window.bp );

src/bp-groups/bp-groups-cssjs.php

@@ -19 +19 @@
     wp_register_script(
         'bp-group-manage-members',
         sprintf( '%1$sbp-groups/js/manage-members%2$s.js', buddypress()->plugin_url, bp_core_get_minified_asset_suffix() ),
-        array( 'json2', 'wp-backbone', 'bp-api-request' ),
+        array( 'json2', 'wp-backbone', 'wp-api-request' ),
         bp_get_version(),
         true
     );

src/bp-groups/js/manage-members.js

@@ -4 +4 @@
 ( function( wp, bp, $ ) {
 
         // Bail if not set
-        if ( typeof bpGroupManageMembersSettings === 'undefined' || ! bp.isRestEnabled ) {
+        if ( typeof bpGroupManageMembersSettings === 'undefined' ) {
                 return;
         }
 
@@ -62 +62 @@
                                         options.headers = { 'X-HTTP-Method-Override': 'PUT' };
                                 }
 
-                                return bp.apiRequest( options );
+                                return wp.apiRequest( options );
                         }
                 },
 
@@ -117 +117 @@
                                         }
                                 };
 
-                                return bp.apiRequest( options );
+                                return wp.apiRequest( options );
                         }
                 }
         } );

src/bp-members/bp-members-template.php

@@ -2745 +2745 @@
  * @return bool
  */
 function bp_signup_requires_privacy_policy_acceptance() {
-        // Bail if we're running a version of WP that doesn't have the Privacy Policy feature.
-        if ( bp_is_running_wp( '4.9.6', '<' ) ) {
-                return false;
-        }
 
         // Default to true when a published Privacy Policy page exists.
         $privacy_policy_url = get_privacy_policy_url();

src/bp-settings/bp-settings-functions.php

@@ -248 +248 @@
         ) );
 
         if ( ! empty( $query->post ) ) {
-                // WP 5.4 changed the user request function name to wp_get_user_request()
-                $user_request = bp_is_running_wp( '4.9.6' ) ? 'wp_get_user_request' : 'wp_get_user_request_data';
-                return $user_request( $query->post->ID );
+                return wp_get_user_request( $query->post->ID );
         } else {
                 return false;
         }

src/bp-settings/classes/class-bp-settings-component.php

@@ -198 +198 @@
                  */
                 $show_data_page = apply_filters( 'bp_settings_show_user_data_page', true );
 
-                // Export Data - only available for WP 4.9.6+.
-                if ( true === $show_data_page && bp_is_running_wp( '4.9.6' ) ) {
+                // Export Data.
+                if ( true === $show_data_page ) {
                         $sub_nav[] = array(
                                 'name'            => __( 'Export Data', 'buddypress' ),
                                 'slug'            => 'data',
@@ -278 +278 @@
                         $show_data_page = apply_filters( 'bp_settings_show_user_data_page', true );
 
                         // Export Data.
-                        if ( true === $show_data_page && bp_is_running_wp( '4.9.6' ) ) {
+                        if ( true === $show_data_page ) {
                                 $wp_admin_nav[] = array(
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-data',

src/class-buddypress.php

@@ -558 +558 @@
                         require $this->plugin_dir . 'bp-core/deprecated/7.0.php';
                         require $this->plugin_dir . 'bp-core/deprecated/8.0.php';
                         require $this->plugin_dir . 'bp-core/deprecated/9.0.php';
+                        require $this->plugin_dir . 'bp-core/deprecated/10.0.php';
                 }
 
                 // Load wp-cli module if PHP 5.6+.

src/readme.txt

@@ -3 +3 @@
 Tags: user profiles, activity streams, messaging, friends, user groups, notifications, community, social networking, intranet
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
-Requires at least: 4.9
+Requires at least: 5.4
 Requires PHP: 5.6
 Tested up to: 5.8
 Stable tag: 9.1.1