WordPress/wordpress-activitypub
1
0
Fork 0
mirror of https://github.com/Automattic/wordpress-activitypub synced 2024-10-18 21:43:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix #627

Browse source
This commit is contained in:
Matthias Pfefferle 2024-01-10 10:27:05 +01:00
parent 3f8d6af7fc
commit 20a49edb1b
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/class-health-check.php
View file

@ -254,15 +254,19 @@ class Health_Check {
public static function is_webfinger_endpoint_accessible() { public static function is_webfinger_endpoint_accessible() {
$user = \wp_get_current_user(); $user = \wp_get_current_user();
$resource = '';
if ( ! is_user_type_disabled( 'blog' ) ) { if ( ! is_user_type_disabled( 'blog' ) ) {
$account = get_webfinger_resource( $user->ID ); $user = Users::get_by_id( $user->ID );
} elseif ( ! is_user_type_disabled( 'user' ) ) { } elseif ( ! is_user_type_disabled( 'user' ) ) {
$account = get_webfinger_resource( Users::BLOG_USER_ID ); $user = Users::get_by_id( Users::BLOG_USER_ID );
} else {
$account = '';
} }
$url = Webfinger::resolve( $account ); if ( $user && ! is_wp_error( $user ) ) {
$resource = $user->get_webfinger();
}
$url = Webfinger::resolve( $resource );
if ( \is_wp_error( $url ) ) { if ( \is_wp_error( $url ) ) {
$allowed = array( 'code' => array() ); $allowed = array( 'code' => array() );
$not_accessible = wp_kses( $not_accessible = wp_kses(

5
includes/class-webfinger.php
View file

@ -20,11 +20,6 @@ class Webfinger {
* @return string The user-resource * @return string The user-resource
*/ */
public static function get_user_resource( $user_id ) { public static function get_user_resource( $user_id ) {
// use WebFinger plugin if installed
if ( \function_exists( '\get_webfinger_resource' ) ) {
return \get_webfinger_resource( $user_id, false );
}
$user = Users::get_by_id( $user_id ); $user = Users::get_by_id( $user_id );
if ( ! $user || is_wp_error( $user ) ) { if ( ! $user || is_wp_error( $user ) ) {
return ''; return '';