Merge branch 'release' into PROD-7724

bp-loader.php

@@ -5,7 +5,7 @@
  * Description: The BuddyBoss Platform adds community features to WordPress. Member Profiles, Activity Feeds, Direct Messaging, Notifications, and more!
  * Author:      BuddyBoss
  * Author URI:  https://buddyboss.com/
- * Version:     2.7.10
+ * Version:     2.7.20
  * Text Domain: buddyboss
  * Domain Path: /bp-languages/
  * License:     GPLv2 or later (license.txt)

package.json

@@ -41,5 +41,5 @@
 	},
 	"license": "GPL-2.0-or-later",
 	"version": "3.1.0",
-	"BBVersion": "2.7.10"
+	"BBVersion": "2.7.20"
 }

src/bp-core/compatibility/class-bb-the-events-calendar-helpers.php

@@ -55,6 +55,7 @@ public static function instance() {
 	public function compatibility_init() {
 		add_filter( 'parse_query', array( $this, 'bb_core_tribe_events_parse_query' ) );
 		add_filter( 'tribe_rewrite_parse_query_vars', array( $this, 'bb_core_tribe_events_set_query_vars' ) );
+		add_filter( 'bp_private_network_pre_check', array( $this, 'bb_private_network_pre_check_event_ical' ) );
 	}
 
 	/**
@@ -117,6 +118,32 @@ public function bb_core_tribe_events_set_query_vars( $query_vars ) {
 		return $query_vars;
 	}
 
+	/**
+	 * Allows access to event iCal for non-logged-in users on a private network.
+	 *
+	 * This function is hooked into the `bp_private_network_pre_check` filter and
+	 * modifies the privacy check for the site when an iCal request is made.
+	 * It ensures that the iCal feed remains accessible even if the site is private
+	 * and the user is not logged in if the request includes the `ical`
+	 * query parameter.
+	 *
+	 * @since BuddyBoss 2.7.20
+	 *
+	 * @param bool $is_public Whether the network is currently considered public or not.
+	 *                        Default is `false` for private networks.
+	 *
+	 * @return bool True if the iCal feed should be publicly accessible, otherwise false.
+	 */
+	public function bb_private_network_pre_check_event_ical( $is_public ) {
+
+		// Check if the private site is enabled and it's an iCal request.
+		if ( ! $is_public && ! empty( $_GET['ical'] ) ) {
+			$is_public = true;
+		}
+
+		return $is_public;
+	}
+
 }
 
 BB_The_Event_Calendar_Helpers::instance();

src/bp-integrations/learndash/buddypress/components/BpGroupCourses.php

@@ -182,6 +182,6 @@ protected function showTabOnView() {
 	 * @since BuddyBoss 1.0.0
 	 */
 	protected function showTabOnCreate() {
-		return bp_ld_sync( 'settings' )->get( 'buddypress.show_in_bp_create', true );
+		return bp_ld_sync( 'settings' )->get( 'buddypress.enabled' ) && bp_ld_sync( 'settings' )->get( 'buddypress.show_in_bp_create', true );
 	}
 }

src/bp-loader.php

@@ -5,7 +5,7 @@
  * Description: The BuddyBoss Platform adds community features to WordPress. Member Profiles, Activity Feeds, Direct Messaging, Notifications, and more!
  * Author:      BuddyBoss
  * Author URI:  https://buddyboss.com/
- * Version:     2.7.10
+ * Version:     2.7.20
  * Text Domain: buddyboss
  * Domain Path: /languages/
  * License:     GPLv2 or later (license.txt)
@@ -24,7 +24,7 @@
 }
 
 if ( ! defined( 'BP_PLATFORM_VERSION' ) ) {
-	define( 'BP_PLATFORM_VERSION', '2.7.10' );
+	define( 'BP_PLATFORM_VERSION', '2.7.20' );
 }
 
 if ( ! defined( 'BP_PLATFORM_API' ) ) {

src/bp-media/bp-media-filters.php

@@ -831,7 +831,11 @@ function bp_media_forums_save_gif_data( $post_id ) {
 			bp_activity_update_meta( $main_activity_id, '_gif_data', $gdata );
 			bp_activity_update_meta( $main_activity_id, '_gif_raw_data', $gif_data );
 		}
-	} else {
+	} elseif (
+		isset( $_POST['action'] ) &&
+		in_array( $_POST['action'], array( 'bbp-edit-reply', 'bbp-edit-topic', 'bbp-edit-forum' ), true ) &&
+		empty( $_POST['bbp_media_gif'] )
+	) {
 		delete_post_meta( $post_id, '_gif_data' );
 		delete_post_meta( $post_id, '_gif_raw_data' );
 

src/bp-members/classes/class-bp-rest-members-endpoint.php

@@ -260,7 +260,6 @@ public function get_items( $request ) {
 				empty( $request['scope'] )
 				|| ( isset( $request['scope'] ) && 'all' === $request['scope'] )
 			)
-			&& empty( $request['bp_ps_search'] )
 			&& function_exists( 'bp_get_users_of_removed_member_types' )
 			&& ! empty( bp_get_users_of_removed_member_types() )
 		) {

src/endpoints/api_project.js

@@ -13,7 +13,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2024-10-02T11:37:58.464Z",
+    "time": "2024-10-16T06:21:27.490Z",
     "url": "http://apidocjs.com",
     "version": "0.22.1"
   }

src/endpoints/api_project.json

@@ -13,7 +13,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2024-10-02T11:37:58.464Z",
+    "time": "2024-10-16T06:21:27.490Z",
     "url": "http://apidocjs.com",
     "version": "0.22.1"
   }