Ticket #7906: 7906.3.diff

src/bp-activity/bp-activity-filters.php

@@ -31 +31 @@
 add_filter( 'bp_activity_content_before_save',       'force_balance_tags' );
 add_filter( 'bp_activity_action_before_save',        'force_balance_tags' );
 
-if ( function_exists( 'wp_encode_emoji' ) ) {
-        add_filter( 'bp_activity_content_before_save', 'wp_encode_emoji' );
-}
+add_filter( 'bp_activity_content_before_save', 'wp_encode_emoji' );
 
 add_filter( 'bp_get_activity_action',                'wptexturize' );
 add_filter( 'bp_get_activity_content_body',          'wptexturize' );

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

@@ -575 +575 @@
         bp_blogs_delete_blogmeta( (int) $site_id, 'url' );
 }
 
-if ( function_exists( 'wp_switch_roles_and_user' ) ) {
+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' );

src/bp-core/bp-core-blocks.php

@@ -19 +19 @@
  *              False otherwise.
  */
 function bp_support_blocks() {
-        return function_exists( 'register_block_type' ) && bp_rest_api_is_available();
+        return bp_is_running_wp( '5.0.0' ) && bp_rest_api_is_available();
 }
 
 /**

src/bp-core/bp-core-catchuri.php

@@ -463 +463 @@
          * Wiping out the bp-default template allows WordPress to use their special
          * embed template, which is what we want.
          */
-        if ( function_exists( 'is_embed' ) && is_embed() ) {
+        if ( is_embed() ) {
                 $located_template = '';
         }
 

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

@@ -70 +70 @@
                 return !empty( $bp->db_version_raw ) ? $bp->db_version_raw : 0;
         }
 
+/**
+ * Check whether the current version of WP exceeds a given version.
+ *
+ * @since 7.0.0
+ *
+ * @param string $version WP version, in "PHP-standardized" format.
+ * @param string $compare Optional. Comparison operator. Default '>='.
+ * @return bool
+ */
+function bp_is_running_wp( $version, $compare = '>=' ) {
+        return version_compare( $GLOBALS['wp_version'], $version, $compare );
+}
+
 /** Functions *****************************************************************/
 
 /**
@@ -3134 +3147 @@
         }
 
         // register_term_meta() was introduced in WP 4.9.8.
-        if ( ! function_exists( 'register_term_meta' ) ) {
+        if ( ! bp_is_running_wp( '4.9.8' ) ) {
                 $args['object_subtype'] = $type_tax;
 
                 return register_meta( 'term', $meta_key, $args );
@@ -3538 +3551 @@
                 )
         );
 
-        if ( version_compare( $GLOBALS['wp_version'], '4.9.6', '>=' ) ) {
+        if ( bp_is_running_wp( '4.9.6' ) ) {
                 $privacy_policy_url = get_privacy_policy_url();
                 if ( $privacy_policy_url ) {
                         $footer_text[] = sprintf(

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

@@ -56 +56 @@
          *
          * @param boolean $value True if the BP REST API is available. False otherwise.
          */
-        return apply_filters( 'bp_rest_api_is_available', function_exists( 'create_initial_rest_routes' ) && bp_rest_in_buddypress() ) || bp_rest_is_plugin_active();
+        return apply_filters( 'bp_rest_api_is_available', bp_is_running_wp( '4.7.0' ) && bp_rest_in_buddypress() ) || bp_rest_is_plugin_active();
 }
 
 /**

src/bp-core/bp-core-theme-compatibility.php

@@ -665 +665 @@
  */
 function bp_template_include_theme_compat( $template = '' ) {
         // If embed template, bail.
-        if ( true === function_exists( 'is_embed' ) && is_embed() ) {
+        if ( is_embed() ) {
                 return $template;
         }
 

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

@@ -562 +562 @@
          */
         public function add_privacy_policy_content() {
                 // Nothing to do if we're running < WP 4.9.6.
-                if ( version_compare( $GLOBALS['wp_version'], '4.9.6', '<' ) ) {
+                if ( bp_is_running_wp( '4.9.6', '<' ) ) {
                         return;
                 }
 

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

@@ -117 +117 @@
                  */
                 $id = apply_filters( 'embed_post_id', 0 );
 
-                $unfiltered_html   = current_user_can( 'unfiltered_html' );
-                $default_discovery = false;
-
                 // Since 4.4, WordPress is now an oEmbed provider.
-                if ( function_exists( 'wp_oembed_register_route' ) ) {
-                        $unfiltered_html   = true;
-                        $default_discovery = true;
-                }
+                $unfiltered_html   = true;
+                $default_discovery = true;
 
                 /**
                  * Filters whether or not oEmbed discovery is on.

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

@@ -50 +50 @@
         );
 
         $preloaded_members = array();
-        if ( function_exists( 'rest_preload_api_request' ) ) {
+        if ( bp_is_running_wp( '5.0.0' ) ) {
                 $preloaded_members = rest_preload_api_request( '', $path );
         }
 

src/bp-groups/bp-groups-filters.php

@@ -53 +53 @@
 add_filter( 'groups_group_description_before_save', 'trim' );
 
 // Support emoji.
-if ( function_exists( 'wp_encode_emoji' ) ) {
-        add_filter( 'groups_group_description_before_save', 'wp_encode_emoji' );
-}
+add_filter( 'groups_group_description_before_save', 'wp_encode_emoji' );
 
 // Escape output of new group creation details.
 add_filter( 'bp_get_new_group_name',        'esc_attr'     );

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

@@ -2416 +2416 @@
  */
 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 ( version_compare( $GLOBALS['wp_version'], '4.9.6', '<' ) ) {
+        if ( bp_is_running_wp( '4.9.6', '<' ) ) {
                 return false;
         }
 

src/bp-messages/bp-messages-filters.php

@@ -32 +32 @@
 add_filter( 'messages_notice_message_before_save',  'force_balance_tags' );
 add_filter( 'messages_notice_subject_before_save',  'force_balance_tags' );
 
-if ( function_exists( 'wp_encode_emoji' ) ) {
-        add_filter( 'messages_message_subject_before_save', 'wp_encode_emoji' );
-        add_filter( 'messages_message_content_before_save', 'wp_encode_emoji' );
-        add_filter( 'messages_notice_message_before_save',  'wp_encode_emoji' );
-        add_filter( 'messages_notice_subject_before_save',  'wp_encode_emoji' );
-}
+add_filter( 'messages_message_subject_before_save', 'wp_encode_emoji' );
+add_filter( 'messages_message_content_before_save', 'wp_encode_emoji' );
+add_filter( 'messages_notice_message_before_save',  'wp_encode_emoji' );
+add_filter( 'messages_notice_subject_before_save',  'wp_encode_emoji' );
 
 add_filter( 'bp_get_message_notice_subject',     'wptexturize' );
 add_filter( 'bp_get_message_notice_text',        'wptexturize' );

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

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

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

@@ -193 +193 @@
                 $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 && version_compare( $GLOBALS['wp_version'], '4.9.6', '>=' ) ) {
+                if ( true === $show_data_page && bp_is_running_wp( '4.9.6' ) ) {
                         $sub_nav[] = array(
                                 'name'            => __( 'Export Data', 'buddypress' ),
                                 'slug'            => 'data',
@@ -268 +268 @@
                         $show_data_page = apply_filters( 'bp_settings_show_user_data_page', true );
 
                         // Export Data.
-                        if ( true === $show_data_page && version_compare( $GLOBALS['wp_version'], '4.9.6', '>=' ) ) {
+                        if ( true === $show_data_page && bp_is_running_wp( '4.9.6' ) ) {
                                 $wp_admin_nav[] = array(
                                         'parent'   => 'my-account-' . $this->id,
                                         'id'       => 'my-account-' . $this->id . '-data',