eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Revert "Show <activity:subject> and no activity actors for user feed"

Browse Source 
This reverts commit c25fc8a4b5.
This commit is contained in:
Evan Prodromou 2010-03-02 03:40:43 -05:00
parent 40ac724797
commit e2578cfad6
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/Notice.php
View File

@ -1090,7 +1090,7 @@ class Notice extends Memcached_DataObject
return $groups; return $groups;
} }
function asAtomEntry($namespace=false, $source=false, $author=true) function asAtomEntry($namespace=false, $source=false)
{ {
$profile = $this->getProfile(); $profile = $this->getProfile();
@ -1135,10 +1135,8 @@ class Notice extends Memcached_DataObject
$xs->element('title', null, $this->content); $xs->element('title', null, $this->content);
if ($author) { $xs->raw($profile->asAtomAuthor());
$xs->raw($profile->asAtomAuthor()); $xs->raw($profile->asActivityActor());
$xs->raw($profile->asActivityActor());
}
$xs->element('link', array('rel' => 'alternate', $xs->element('link', array('rel' => 'alternate',
'type' => 'text/html', 'type' => 'text/html',

16
lib/atomnoticefeed.php
View File

@ -107,19 +107,9 @@ class AtomNoticeFeed extends Atom10Feed
*/ */
function addEntryFromNotice($notice) function addEntryFromNotice($notice)
{ {
$source = $this->showSource(); $this->addEntryRaw($notice->asAtomEntry());
$author = $this->showAuthor();
$this->addEntryRaw($notice->asAtomEntry(false, $source, $author));
} }
function showSource()
{
return true;
}
function showAuthor()
{
return true;
}
} }

11
lib/atomusernoticefeed.php
View File

@ -61,7 +61,6 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
if (!empty($user)) { if (!empty($user)) {
$profile = $user->getProfile(); $profile = $user->getProfile();
$this->addAuthor($profile->nickname, $user->uri); $this->addAuthor($profile->nickname, $user->uri);
$this->setActivitySubject($profile->asActivityNoun('subject'));
} }
} }
@ -69,14 +68,4 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
{ {
return $this->user; return $this->user;
} }
function showSource()
{
return false;
}
function showAuthor()
{
return false;
}
} }