Merge branch 'release'

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.6.60
+ * Version:     2.6.70
  * 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.6.60"
+	"BBVersion": "2.6.70"
 }

src/bp-activity/bp-activity-functions.php

@@ -5400,6 +5400,7 @@ function bp_activity_default_scope( $scope = 'all' ) {
 
 			if ( bp_is_single_activity() && bp_is_active( 'media' ) ) {
 				$new_scope[] = 'media';
+				$new_scope[] = 'video';
 				$new_scope[] = 'document';
 			}
 		} elseif ( bp_is_user_activity() ) {

src/bp-activity/bp-activity-template.php

@@ -1646,7 +1646,7 @@ function bp_activity_user_can_delete( $activity = false ) {
 		}
 
 		// Viewing a single item, and this user is an admin of that item.
-		if ( bp_is_single_item() && bp_is_item_admin() ) {
+		if ( 'groups' !== $activity->component && bp_is_single_item() && bp_is_item_admin() ) {
 			$can_delete = true;
 		}
 	}
@@ -2848,7 +2848,7 @@ function bp_get_activity_css_class() {
 	$link_preview_data = ! empty( $activity_metas['_link_preview_data'][0] ) ? maybe_unserialize( $activity_metas['_link_preview_data'][0] ) : array();
 
 	if (
-		'0' !== $link_embed ||
+		! empty( $link_embed ) ||
 		! empty( $link_preview_data )
 	) {
 		$class .= ' wp-link-embed';

src/bp-core/bp-core-template.php

@@ -937,6 +937,12 @@ function bp_create_excerpt( $text, $length = 225, $options = array() ) {
 		$text = strip_shortcodes( $text );
 	}
 
+	// Remove all matched wp block comments from the content.
+	if ( function_exists( 'has_blocks' ) && has_blocks( $text ) ) {
+		$pattern = '/<!--\s*\/?wp:[^>]+-->/';
+		$text    = preg_replace( $pattern, '', $text );
+	}
+
 	// When $html is true, the excerpt should be created without including HTML tags in the
 	// excerpt length.
 	if ( ! empty( $r['html'] ) ) {

src/bp-core/js/register.js

@@ -337,8 +337,8 @@ jQuery( document ).ready( function() {
 
 
 	function bp_register_validate_email() {
-		var email1 				 = emailSelector.val(),
-			email2 				 = confirmEmailSelector.val(),
+		var email1 				 = emailSelector.val().toLowerCase(),
+			email2 				 = confirmEmailSelector.val().toLowerCase(),
 		    regex 				 = /^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 			errorMessageSelector = jQuery( '#email-strength-result' );
 
@@ -366,8 +366,8 @@ jQuery( document ).ready( function() {
 			return;
 		}
 
-		var email1 				 = emailSelector.val(),
-		    email2 				 = confirmEmailSelector.val(),
+		var email1 				 = emailSelector.val().toLowerCase(),
+		    email2 				 = confirmEmailSelector.val().toLowerCase(),
 		    regex 				 = /^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 			errorMessageSelector = jQuery( '#email-strength-result' );
 

src/bp-document/bp-document-functions.php

@@ -5195,7 +5195,12 @@ function bb_document_get_activity_document( $activity = '', $args = array() ) {
 
 	// Get activity metas.
 	$activity_metas = bb_activity_get_metadata( $activity->id );
-	$document_ids   = ! empty( $activity_metas['bp_document_ids'][0] ) ? $activity_metas['bp_document_ids'][0] : '';
+	$document_ids   = '';
+	if ( ! empty( $activity_metas['bp_document_ids'][0] ) ) {
+		$document_ids = $activity_metas['bp_document_ids'][0];
+	} elseif ( ! empty( $activity_metas['bp_document_id'][0] ) ) {
+		$document_ids = $activity_metas['bp_document_id'][0];
+	}
 
 	if ( empty( $document_ids ) ) {
 		return false;