Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
This commit is contained in:
commit
dbc6d607ce
|
@ -570,18 +570,6 @@ class Activity
|
||||||
|
|
||||||
if ($author) {
|
if ($author) {
|
||||||
$this->actor->outputTo($xs, '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') {
|
if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {
|
||||||
|
|
|
@ -374,7 +374,8 @@ class ActivityPlugin extends Plugin
|
||||||
if (!empty($fave)) {
|
if (!empty($fave)) {
|
||||||
$notice = Notice::staticGet('id', $fave->notice_id);
|
$notice = Notice::staticGet('id', $fave->notice_id);
|
||||||
if (!empty($notice)) {
|
if (!empty($notice)) {
|
||||||
$target = $notice->asActivity();
|
$cur = common_current_user();
|
||||||
|
$target = $notice->asActivity($cur);
|
||||||
if ($target->verb == ActivityVerb::POST) {
|
if ($target->verb == ActivityVerb::POST) {
|
||||||
// "I like the thing you posted"
|
// "I like the thing you posted"
|
||||||
$activity->objects = $target->objects;
|
$activity->objects = $target->objects;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user