Commit f4c0cff0 authored by mmn's avatar mmn

Only use ActivityVerb::SHARE (forwardId is deprecated)

StatusNet >= 1.0 support it.
parent 80048493
......@@ -1603,18 +1603,6 @@ class Notice extends Managed_DataObject
break;
}
// XXX: deprecated; use ActivityVerb::SHARE instead
$repeat = null;
if (!empty($this->repeat_of)) {
$repeat = Notice::getKV('id', $this->repeat_of);
if (!empty($repeat)) {
$ctx->forwardID = $repeat->uri;
$ctx->forwardUrl = $repeat->bestUrl();
}
}
$act->context = $ctx;
$source = $this->getSource();
......
......@@ -631,19 +631,6 @@ class Activity
'href' => $attnURI));
}
// XXX: shoulda used ActivityVerb::SHARE
if (!empty($this->context->forwardID)) {
if (!empty($this->context->forwardUrl)) {
$xs->element('ostatus:forward',
array('ref' => $this->context->forwardID,
'href' => $this->context->forwardUrl));
} else {
$xs->element('ostatus:forward',
array('ref' => $this->context->forwardID));
}
}
if (!empty($this->context->location)) {
$loc = $this->context->location;
$xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);
......
......@@ -40,8 +40,6 @@ class ActivityContext
public $attention = array();
public $attentionType = array();
public $conversation;
public $forwardID; // deprecated, use ActivityVerb::SHARE instead
public $forwardUrl; // deprecated, use ActivityVerb::SHARE instead
public $scope;
const THR = 'http://purl.org/syndication/thread/1.0';
......@@ -141,8 +139,6 @@ class ActivityContext
$context['inReplyTo'] = $this->getInReplyToArray();
$context['conversation'] = $this->conversation;
$context['forwardId'] = $this->forwardID;
$context['forwardUrl'] = $this->forwardUrl;
return array_filter($context);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment