Merge branch 'release' into PROD-7464

* release: (79 commits)
Update: Grunt
Update: Grunt string-replace
Update: Version name update
grunt
added release note
PROD-7527 - Fixed - typo
PROD-7527 - Remove unwanted php tags and move variable at top
PROD-7527 - fix the subgroups loading when page request setup to 1
PROD-7527 - Fixed - blocked member screen for member when set page 1
PROD-7527 - Fixed - notification screen for member when set page 1
PROD-7527 - Grunt
PROD-7527 - When set page request 1 and load page then sub menu not selected display
PROD-7527 - Fixed - Group member page not loading when we set page request 1
Update: Grunt
Update: Grunt string-replace
Update: Version name update
added change log
grunt
pulled api changes from repo
PROD-7516 - Grunt
...

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

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

@@ -178,6 +178,7 @@
 add_filter( 'bp_get_activity_content', 'bb_mention_add_user_dynamic_link', 20, 1 );
 add_filter( 'bp_get_activity_content_body', 'bb_mention_add_user_dynamic_link', 20, 1 );
 add_filter( 'bp_activity_comment_content', 'bb_mention_add_user_dynamic_link', 20, 1 );
+add_filter( 'the_content', 'bb_mention_add_user_dynamic_link', 20, 1 );
 
 // Modal template for activity.
 add_action( 'bp_after_directory_activity_list', 'bb_activity_add_modal_template' );

src/bp-core/admin/bp-core-admin-settings.php

@@ -1087,13 +1087,6 @@ function bp_admin_setting_callback_preview_group_avatar_cover() {
 
 		<div class="preview-switcher-main">
 
-			<div class="button-group preview-switcher">
-				<?php if ( $live_preview_settings['is_buddyboss_app_plugin_active'] ) : ?>
-					<a href="#web-preview" class="button button-large button-primary"><?php esc_html_e( 'Browser', 'buddyboss' ); ?></a>
-					<a href="#app-preview" class="button button-large"><?php esc_html_e( 'App', 'buddyboss' ); ?></a>
-				<?php endif; ?>
-			</div>
-
 			<div class="web-preview-wrap preview-block active" id="web-preview">
 				<div class="preview-item-cover <?php echo esc_attr( bb_get_profile_cover_image_height() . '-image' ); ?>" style="background-color: <?php echo esc_attr( $live_preview_settings['web_background_color'] ); ?>">
 					<img src="<?php echo esc_url( $web_cover_preview ); ?>" alt="" data-buddyboss-cover="<?php echo esc_url( buddypress()->plugin_url . 'bp-core/images/cover-image.png' ); ?>">
@@ -1103,17 +1096,6 @@ function bp_admin_setting_callback_preview_group_avatar_cover() {
 				</div>
 			</div>
 
-			<?php if ( $live_preview_settings['is_buddyboss_app_plugin_active'] ) : ?>
-				<div class="app-preview-wrap preview-block" id="app-preview">
-					<div class="preview-item-cover" style="background-color: <?php echo esc_attr( $live_preview_settings['app_background_color'] ); ?>">
-						<img src="<?php echo esc_url( $app_cover_preview ); ?>" alt="" data-buddyboss-cover="<?php echo esc_url( buddypress()->plugin_url . 'bp-core/images/cover-image.png' ); ?>">
-					</div>
-					<div class="preview-item-avatar">
-						<img src="<?php echo esc_url( $avatar ); ?>" alt="" class="group-custom-avatar" data-blank-avatar="<?php echo esc_url( bb_get_blank_profile_avatar() ); ?>">
-					</div>
-				</div>
-			<?php endif; ?>
-
 		</div>
 
 	</div>
@@ -2291,7 +2273,7 @@ function bb_admin_setting_group_header_style() {
 		);
 		?>
 	</div>
-	<p class="description"><?php echo esc_html__( 'Select the style of your group headers. Group avatars and cover images will only be displayed if they are enabled.', 'buddyboss' ); ?></p>
+	<p class="description"><?php echo esc_html__( 'Select the style of your group header. Group avatars and cover images will only be displayed if they are enabled. This setting does not apply to the App style.', 'buddyboss' ); ?></p>
 	<?php
 }
 

src/bp-core/bp-core-avatars.php

@@ -1715,6 +1715,10 @@ function bp_core_get_upload_dir( $type = 'upload_path' ) {
 	if ( isset( $bp->avatar->$type ) ) {
 		$retval = $bp->avatar->$type;
 	} else {
+		if ( ! isset( $bp->avatar ) ) {
+			$bp->avatar = new stdClass();
+		}
+
 		// If this value has been set in a constant, just use that.
 		if ( defined( $constant ) ) {
 			$retval = constant( $constant );

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

@@ -698,8 +698,8 @@ function bp_core_no_access( $args = '' ) {
 
 	// Build the redirect URL.
 	$redirect_url  = is_ssl() ? 'https://' : 'http://';
-	$redirect_url .= $_SERVER['HTTP_HOST'];
-	$redirect_url .= $_SERVER['REQUEST_URI'];
+	$redirect_url .= $_SERVER['HTTP_HOST'] ?? '';
+	$redirect_url .= $_SERVER['REQUEST_URI'] ?? '';
 
 	$defaults = array(
 		'mode'     => 2,                    // 1 = $root, 2 = wp-login.php.

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

@@ -6007,6 +6007,13 @@ function bb_check_server_disabled_symlink() {
  * @since BuddyBoss 1.8.6
  */
 function bb_restricate_rss_feed() {
+	if (
+		empty( $_SERVER['HTTP_HOST'] ) ||
+		empty( $_SERVER['REQUEST_URI'] )
+	) {
+		return;
+	}
+
 	$actual_link = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 	if (
 		strpos( $actual_link, '/feed/' ) === false &&

src/bp-core/compatibility/bp-wp-offload-media-helpers.php

@@ -71,6 +71,7 @@ public function compatibility_init() {
 
 		add_filter( 'bb_media_offload_delivered', array( $this, 'bb_media_offload_delivered' ) );
 		add_filter( 'bb_media_offload_delivery_provider', array( $this, 'bb_media_offload_delivery_provider' ) );
+		add_filter( 'bp_core_get_js_strings', array( $this, 'bb_offload_localize_scripts' ) );
 
 	}
 
@@ -349,6 +350,21 @@ public function bb_media_offload_delivery_provider( $delivery_provider ) {
 		return $delivery_provider;
 	}
 
+	/**
+	 * Add extra parameter into localize scripts for offload media plugin.
+	 *
+	 * @since BuddyBoss 2.6.20
+	 *
+	 * @param array $params Localize scripts parameter.
+	 *
+	 * @return array
+	 */
+	public function bb_offload_localize_scripts( $params = array() ) {
+		if ( bp_is_active( 'activity' ) && bp_is_active( 'media' ) ) {
+			$params['is_as3cf_active'] = true;
+		}
+		return $params;
+	}
 }
 
 BB_AS3CF_Plugin_Compatibility::instance();

src/bp-core/js/register.js

@@ -239,6 +239,10 @@ jQuery( document ).ready( function() {
 				jQuery( this ).find( 'input[type="number"]' ).before( html_error );
 				return_val = false;
 			}
+			if ( jQuery( this ).find( 'input[type="tel"]' ).length && jQuery( this ).find( 'input[type="tel"] ').val() == '' ) {
+				jQuery( this ).find( 'input[type="tel"]' ).before( html_error );
+				return_val = false;
+			}
 			if ( jQuery( this ).find( 'textarea' ).length && jQuery( this ).find( 'textarea' ).val() == '' ) {
 				jQuery( this ).find( 'textarea' ).before( html_error );
 				return_val = false;
@@ -259,6 +263,18 @@ jQuery( document ).ready( function() {
 						return_val = false;
 					}
 			}
+			if ( jQuery( this ).find( 'input[type="radio"]' ).length ) {
+				var checked_radio = 0;
+				jQuery( this ).find( 'input[type="radio"]' ).each( function () {
+					if ( jQuery( this ).prop( 'checked' ) == true ) {
+						checked_radio++;
+					}
+				} );
+				if ( 0 >= checked_radio ) {
+					jQuery( this ).find( 'legend' ).next().append( html_error );
+					return_val = false;
+				}
+			}
 		});
 		if ( jQuery( document ).find( signup_email ).length && jQuery( document ).find( signup_email ).val() == '' ) {
 			jQuery( document ).find( signup_email ).before( html_error );