X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=5ca089b859a85d753f7af13903e598e9eb876d95;hb=f9b2feb7f563663d6b564a3cb9223b7c1ea5ecef;hp=acfcbd75fb9fc25ad8ab5b4a0e23ea732167680b;hpb=c748933132b58ba3c837da3ad48979cfc6d52b8a;p=quix0rs-gnu-social.git diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index acfcbd75fb..5ca089b859 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -44,24 +44,24 @@ if (!defined('STATUSNET')) */ class AtomUserNoticeFeed extends AtomNoticeFeed { - private $user; + protected $user; /** * Constructor * * @param User $user the user for the feed + * @param User $cur the current authenticated user, if any * @param boolean $indent flag to turn indenting on or off * * @return void */ - - function __construct($user, $indent = true) { - parent::__construct($indent); + function __construct($user, $cur = null, $indent = true) { + parent::__construct($cur, $indent); $this->user = $user; if (!empty($user)) { $profile = $user->getProfile(); - $this->addAuthor($profile->nickname, $user->uri); - $this->setActivitySubject($profile->asActivityNoun('subject')); + $ao = ActivityObject::fromProfile($profile); + $this->addAuthorRaw($ao->asString('author')); } // TRANS: Title in atom user notice feed. %s is a user name. @@ -89,7 +89,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed array('nickname' => $user->nickname) ) ); - + $self = common_local_url('ApiTimelineUser', array('id' => $user->id, 'format' => 'atom'));