| @@ -896,9 +896,9 @@ | ||
| 896 | 896 | return ''; |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | $author_name = $author->display_name; |
| 900 | - $author_name_html = Feed_Parser_ActivityPub::replace_custom_emojis_for_user( $author_name, $author ); | |
| 900 | + $author_name_html = apply_filters( 'friends_author_display_name_html', esc_html( $author_name ), $author_name, $author ); | |
| 901 | 901 | $override_author_name = apply_filters( 'friends_override_author_name', '', $author_name, $block->context['postId'] ); |
| 902 | 902 | if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) { |
| 903 | 903 | $author_name_html = sprintf( '<a href="%1$s" target="%2$s" class="wp-block-post-author-name__link">%3$s</a>', esc_url( $author->get_local_friends_page_url() ), esc_attr( $attributes['linkTarget'] ), $author_name_html ); |
| 904 | 904 | } |
| @@ -921,9 +921,9 @@ | ||
| 921 | 921 | $wrapper_attributes, |
| 922 | 922 | wp_kses( |
| 923 | 923 | $author_name_html, |
| 924 | 924 | array_merge( |
| 925 | - Feed_Parser_ActivityPub::get_custom_emoji_allowed_html(), | |
| 925 | + wp_kses_allowed_html( 'post' ), | |
| 926 | 926 | array( |
| 927 | 927 | 'a' => array( |
| 928 | 928 | 'class' => true, |
| 929 | 929 | 'href' => true, |
| @@ -2218,8 +2218,13 @@ | ||
| 2218 | 2218 | $is_friends = array_shift( $pagename_parts ); |
| 2219 | 2219 | |
| 2220 | 2220 | if ( 'friends' !== $is_friends ) { |
| 2221 | 2221 | return $query; |
| 2222 | + } | |
| 2223 | + | |
| 2224 | + if ( isset( $pagename_parts[0] ) && 'settings' === $pagename_parts[0] ) { | |
| 2225 | + wp_safe_redirect( self_admin_url( 'admin.php?page=friends-settings' ) ); | |
| 2226 | + exit; | |
| 2222 | 2227 | } |
| 2223 | 2228 | |
| 2224 | 2229 | // Not available for the general public or friends. |
| 2225 | 2230 | $viewable = $this->has_required_priviledges() && Friends::on_frontend(); |
