GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't output deprecated <activity:actor> element

This commit is contained in:
Evan Prodromou 2010-12-27 09:25:26 -08:00
parent e0606d3eca
commit 1188d5bab2
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/activity.php
View File

@ -377,13 +377,7 @@ class Activity
$xs->element('updated', null, $published);
if ($author) {
$xs->elementStart('author');
$xs->element('uri', array(), $this->actor->id);
if ($this->actor->title) {
$xs->element('name', array(), $this->actor->title);
}
$xs->elementEnd('author');
$this->actor->outputTo($xs, 'activity:actor');
$this->actor->outputTo($xs, 'author');
}
if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {

19
lib/activityobject.php
View File

@ -498,14 +498,21 @@ class ActivityObject
$xo->element('activity:object-type', null, $this->type);
$xo->element(self::ID, null, $this->id);
// <author> uses URI
if ($tag == 'author') {
$xo->element(self::URI, null, $this->id);
} else {
$xo->element(self::ID, null, $this->id);
}
if (!empty($this->title)) {
$xo->element(
self::TITLE,
null,
common_xml_safe_str($this->title)
);
$name = common_xml_safe_str($this->title);
if ($tag == 'author') {
$xo->element(self::NAME, null, $name);
} else {
$xo->element(self::TITLE, null, $name);
}
}
if (!empty($this->summary)) {