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

Author: pfefferle

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;
 		}
 

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();