Introduced isCurrentProfileInScope() which shall check if current profile is

[quix0rs-gnu-social.git] / lib / atomlistnoticefeed.php

diff --git a/lib/atomlistnoticefeed.php b/lib/atomlistnoticefeed.php
index 55ad9d228c584c02d213ae948b85fa6842242fa5..f4765d44099b5ac70e88a316b45667abfea2a6ad 100644 (file)
--- a/lib/atomlistnoticefeed.php
+++ b/lib/atomlistnoticefeed.php
@@ -59,17 +59,17 @@ class AtomListNoticeFeed extends AtomNoticeFeed
     function __construct($list, $cur = null, $indent = true) {
         parent::__construct($cur, $indent);
         $this->list = $list;
-        $this->tagger = Profile::staticGet('id', $list->tagger);
+        $this->tagger = Profile::getKV('id', $list->tagger);
 
         // TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-        $title = sprintf(_('Timeline for people tagged #%1$s by %2$s'), $list->tag, $this->tagger->nickname);
+        $title = sprintf(_('Timeline for people in list %1$s by %2$s'), $list->tag, $this->tagger->nickname);
         $this->setTitle($title);
 
         $sitename   = common_config('site', 'name');
         $subtitle   = sprintf(
             // TRANS: Message is used as a subtitle in atom list notice feed.
             // TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-            _('Updates from %1$s\'s %2$s people tag on %3$s!'),
+            _('Updates from %1$s\'s list %2$s on %3$s!'),
             $this->tagger->nickname,
             $list->tag,
             $sitename
@@ -88,11 +88,9 @@ class AtomListNoticeFeed extends AtomNoticeFeed
         $this->setId($self);
         $this->setSelfLink($self);
 
-        // FIXME: Stop using activity:subject?
         $ao = ActivityObject::fromPeopletag($this->list);
 
-        $this->addAuthorRaw($ao->asString('author').
-                            $ao->asString('activity:subject'));
+        $this->addAuthorRaw($ao->asString('author'));
 
         $this->addLink($this->list->getUri());
     }