Revert "Show <activity:subject> and no activity actors for user feed"
This reverts commit c25fc8a4b5
.
This commit is contained in:
parent
40ac724797
commit
e2578cfad6
|
@ -1090,7 +1090,7 @@ class Notice extends Memcached_DataObject
|
|||
return $groups;
|
||||
}
|
||||
|
||||
function asAtomEntry($namespace=false, $source=false, $author=true)
|
||||
function asAtomEntry($namespace=false, $source=false)
|
||||
{
|
||||
$profile = $this->getProfile();
|
||||
|
||||
|
@ -1135,10 +1135,8 @@ class Notice extends Memcached_DataObject
|
|||
|
||||
$xs->element('title', null, $this->content);
|
||||
|
||||
if ($author) {
|
||||
$xs->raw($profile->asAtomAuthor());
|
||||
$xs->raw($profile->asActivityActor());
|
||||
}
|
||||
$xs->raw($profile->asAtomAuthor());
|
||||
$xs->raw($profile->asActivityActor());
|
||||
|
||||
$xs->element('link', array('rel' => 'alternate',
|
||||
'type' => 'text/html',
|
||||
|
|
|
@ -107,19 +107,9 @@ class AtomNoticeFeed extends Atom10Feed
|
|||
*/
|
||||
function addEntryFromNotice($notice)
|
||||
{
|
||||
$source = $this->showSource();
|
||||
$author = $this->showAuthor();
|
||||
|
||||
$this->addEntryRaw($notice->asAtomEntry(false, $source, $author));
|
||||
$this->addEntryRaw($notice->asAtomEntry());
|
||||
}
|
||||
|
||||
function showSource()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
function showAuthor()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -61,7 +61,6 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
|
|||
if (!empty($user)) {
|
||||
$profile = $user->getProfile();
|
||||
$this->addAuthor($profile->nickname, $user->uri);
|
||||
$this->setActivitySubject($profile->asActivityNoun('subject'));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -69,14 +68,4 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
|
|||
{
|
||||
return $this->user;
|
||||
}
|
||||
|
||||
function showSource()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
function showAuthor()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user