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

Merge remote-tracking branch 'origin/1.0.x' into 1.0.x

This commit is contained in:
Evan Prodromou 2011-09-01 11:30:24 -04:00
parent b53391e500 5f441842be
commit dbc6d607ce
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/activity.php
View File

@ -570,18 +570,6 @@ class Activity
if ($author) {
$this->actor->outputTo($xs, 'author');
// XXX: Remove <activity:actor> ASAP! Author information
// has been moved to the author element in the Activity
// Streams spec. We're outputting actor only for backward
// compatibility with clients that can only parse
// activities based on older versions of the spec.
$depMsg = 'Deprecation warning: activity:actor is present '
. 'only for backward compatibility. It will be '
. 'removed in the next version of StatusNet.';
$xs->comment($depMsg);
$this->actor->outputTo($xs, 'activity:actor');
}
if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {

3
plugins/Activity/ActivityPlugin.php
View File

@ -374,7 +374,8 @@ class ActivityPlugin extends Plugin
if (!empty($fave)) {
$notice = Notice::staticGet('id', $fave->notice_id);
if (!empty($notice)) {
$target = $notice->asActivity();
$cur = common_current_user();
$target = $notice->asActivity($cur);
if ($target->verb == ActivityVerb::POST) {
// "I like the thing you posted"
$activity->objects = $target->objects;