Skip to content

Commit

Permalink
Merged feature/theme-refresh into PROD-2311 and solve conflict and ru…
Browse files Browse the repository at this point in the history
…n grunt
  • Loading branch information
jitendrabanjara1991 committed Mar 25, 2022
2 parents 700fdc0 + 0aa996d commit 620e24c
Show file tree
Hide file tree
Showing 234 changed files with 11,466 additions and 15,265 deletions.
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
**/icons/css/*.css
src/bp-templates/bp-nouveau/icons/css
2 changes: 1 addition & 1 deletion bp-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.9.1
* Version: 1.9.2
* Text Domain: buddyboss
* Domain Path: /bp-languages/
* License: GPLv2 or later (license.txt)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
},
"license": "GPL-2.0-or-later",
"version": "3.1.0",
"BBVersion": "1.9.1"
"BBVersion": "1.9.2"
}
2 changes: 1 addition & 1 deletion src/bp-blogs/bp-blogs-filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function bb_nouveau_get_activity_inner_blogs_buttons( $buttons ) {
'link_text' => sprintf( '<span class="text">%1$s %2$s</span>', esc_html__( 'View', 'buddyboss' ), esc_attr( ucfirst( $post_type_obj->labels->singular_name ) ) ),
'button_attr' => array(
'href' => esc_url( get_permalink( $blog_post->ID ) ),
'class' => 'button bb-icon-arrow-circle bp-secondary-action',
'class' => 'button bb-icon-arrow-down bb-icons bp-secondary-action',
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ table.extension-listing tbody td {
padding: 10px;
}

table.extension-listing tbody td i.bb-icon {
table.extension-listing tbody td [class*=" bb-icon-"] {
font-size: 33px;
color: #999;
margin-right: 8px;
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ table.extension-listing tbody td {
padding: 10px;
}

table.extension-listing tbody td i.bb-icon {
table.extension-listing tbody td [class*=" bb-icon-"] {
font-size: 33px;
color: #999;
margin-left: 8px;
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/bp-core/admin/js/moderation-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jQuery( document ).ready(
nonce: nonce,
};

$( event.currentTarget ).append( ' <i class="bb-icon bb-icon-loader animate-spin"></i>' );
$( event.currentTarget ).append( ' <i class="bb-icon-l bb-icon-spinner animate-spin"></i>' );

$.post(
ajaxurl,
Expand Down Expand Up @@ -119,7 +119,7 @@ jQuery( document ).ready(
nonce: nonce,
};

$( event.currentTarget ).append( ' <i class="bb-icon bb-icon-loader animate-spin"></i>' );
$( event.currentTarget ).append( ' <i class="bb-icon-l bb-icon-spinner animate-spin"></i>' );

$.post(
ajaxurl,
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/js/moderation-page.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/bp-core/admin/sass/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ table.extension-listing {
tbody td {
padding: 10px;

i.bb-icon {
[class*=" bb-icon-"] {
font-size: 33px;
color: #999;
margin-left: 8px;
Expand Down
4 changes: 2 additions & 2 deletions src/bp-core/bp-core-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -4727,7 +4727,7 @@ function bp_ajax_get_suggestions() {
* value. Boolean false if no mentions found.
*/
function bp_find_mentions_by_at_sign( $mentioned_users, $content ) {
$pattern = '/[@]+([A-Za-z0-9-_\.@]+)\b/';
$pattern = '/(?<=[^A-Za-z0-9]|^)@([A-Za-z0-9-_\.@]+)\b/';
preg_match_all( $pattern, $content, $usernames );

// Make sure there's only one instance of each username.
Expand All @@ -4740,7 +4740,7 @@ function bp_find_mentions_by_at_sign( $mentioned_users, $content ) {

// We've found some mentions! Check to see if users exist.
foreach ( (array) array_values( $usernames ) as $username ) {
$user_id = bp_get_userid_from_mentionname( $username );
$user_id = bp_get_userid_from_mentionname( trim( $username ) );

// The user ID exists, so let's add it to our array.
if ( ! empty( $user_id ) ) {
Expand Down
8 changes: 7 additions & 1 deletion src/bp-core/classes/class-bp-admin-tab.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,13 @@ public function settings_save() {

foreach ( $fields as $section => $settings ) {
foreach ( $settings as $setting_name => $setting ) {
$value = isset( $_POST[ $setting_name ] ) ? ( is_array( $_POST[ $setting_name ] ) ? map_deep( wp_unslash( $_POST[ $setting_name ] ), 'sanitize_text_field' ) : sanitize_text_field( wp_unslash( $_POST[ $setting_name ] ) ) ) : '';

if ( in_array( $setting_name, array( 'bp-enable-private-network-public-content', 'bb-enable-private-rss-feeds-public-content', 'bb-enable-private-rest-apis-public-content' ), true ) ) {
$value = isset( $_POST[ $setting_name ] ) ? sanitize_textarea_field( wp_unslash( $_POST[ $setting_name ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
} else {
$value = isset( $_POST[ $setting_name ] ) ? ( is_array( $_POST[ $setting_name ] ) ? map_deep( wp_unslash( $_POST[ $setting_name ] ), 'sanitize_text_field' ) : sanitize_text_field( wp_unslash( $_POST[ $setting_name ] ) ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
}

bp_update_option( $setting_name, $value );
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function widget( $args, $instance ) {
<?php endwhile; ?>
</div>
<?php if ( $follower_count_number > $instance['max_users'] && $show_more ) { ?>
<div class="more-block"><a href="<?php bp_members_directory_permalink(); ?>" class="count-more"><?php esc_html_e( 'See all', 'buddyboss' ); ?><i class="bb-icon-angle-right"></i></a></div>
<div class="more-block"><a href="<?php bp_members_directory_permalink(); ?>" class="count-more"><?php esc_html_e( 'See all', 'buddyboss' ); ?><i class="bb-icon-l bb-icon-angle-right"></i></a></div>
<?php } ?>

<?php echo $args['after_widget']; ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function widget( $args, $instance ) {
<?php endwhile; ?>
</div>
<?php if ( $following_count_number > $instance['max_users'] && $show_more ) { ?>
<div class="more-block more-following"><a href="<?php bp_members_directory_permalink(); ?>#following" class="count-more"><?php esc_html_e( 'See all', 'buddyboss' ); ?><i class="bb-icon-angle-right"></i></a></div>
<div class="more-block more-following"><a href="<?php bp_members_directory_permalink(); ?>#following" class="count-more"><?php esc_html_e( 'See all', 'buddyboss' ); ?><i class="bb-icon-l bb-icon-angle-right"></i></a></div>
<?php } ?>

<?php echo $args['after_widget']; ?>
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/classes/class-bp-email-tokens.php
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ public function token__message( $bp_email, $formatted_tokens, $tokens ) {
<div class="activity-attached-gif-container">
<div class="gif-image-container">
<a href="<?php echo esc_attr( $tokens['message.url'] ); ?>" class="gif-play-button">
<span class="bb-icon-play-thin"></span>
<span class="bb-icon-l bb-icon-play"></span>
<?php if( is_int( $gif_data['still'] ) ) { ?>
<img alt="" src="<?php echo esc_url( wp_get_attachment_url( $gif_data['still'] ) ); ?>" />
<?php } else { ?>
Expand Down
Loading

0 comments on commit 620e24c

Please sign in to comment.