Merge branch 'master' of https://github.com/Automattic/wordpress-acti…

…vitypub
Automattic · Jul 18, 2024 · 04a95ee · 04a95ee
2 parents e490a01 + 7fbfee1
commit 04a95ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/includes/class-activitypub.php b/includes/class-activitypub.php
@@ -515,7 +515,7 @@ public static function user_register( $user_id ) {
 	 * @return array The extra fields.
 	 */
 	public static function default_actor_extra_fields( $extra_fields, $user_id ) {
-		if ( $extra_fields ) {
+		if ( $extra_fields || ! $user_id ) {
 			return $extra_fields;
 		}
 

diff --git a/includes/model/class-user.php b/includes/model/class-user.php
@@ -235,7 +235,7 @@ public function get_endpoints() {
 	 * @return array The extended User-Output.
 	 */
 	public function get_attachment() {
-		$extra_fields = get_actor_extra_fields( \get_current_user_id() );
+		$extra_fields = get_actor_extra_fields( $this->_id );
 
 		$attachments = array();