forked from GNUsocial/gnu-social
Only use ActivityVerb::SHARE (forwardId is deprecated)
StatusNet >= 1.0 support it.
This commit is contained in:
parent
8004849305
commit
f4c0cff032
|
@ -1603,18 +1603,6 @@ class Notice extends Managed_DataObject
|
||||||
break;
|
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;
|
$act->context = $ctx;
|
||||||
|
|
||||||
$source = $this->getSource();
|
$source = $this->getSource();
|
||||||
|
|
|
@ -631,19 +631,6 @@ class Activity
|
||||||
'href' => $attnURI));
|
'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)) {
|
if (!empty($this->context->location)) {
|
||||||
$loc = $this->context->location;
|
$loc = $this->context->location;
|
||||||
$xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);
|
$xs->element('georss:point', null, $loc->lat . ' ' . $loc->lon);
|
||||||
|
|
|
@ -40,8 +40,6 @@ class ActivityContext
|
||||||
public $attention = array();
|
public $attention = array();
|
||||||
public $attentionType = array();
|
public $attentionType = array();
|
||||||
public $conversation;
|
public $conversation;
|
||||||
public $forwardID; // deprecated, use ActivityVerb::SHARE instead
|
|
||||||
public $forwardUrl; // deprecated, use ActivityVerb::SHARE instead
|
|
||||||
public $scope;
|
public $scope;
|
||||||
|
|
||||||
const THR = 'http://purl.org/syndication/thread/1.0';
|
const THR = 'http://purl.org/syndication/thread/1.0';
|
||||||
|
@ -141,8 +139,6 @@ class ActivityContext
|
||||||
|
|
||||||
$context['inReplyTo'] = $this->getInReplyToArray();
|
$context['inReplyTo'] = $this->getInReplyToArray();
|
||||||
$context['conversation'] = $this->conversation;
|
$context['conversation'] = $this->conversation;
|
||||||
$context['forwardId'] = $this->forwardID;
|
|
||||||
$context['forwardUrl'] = $this->forwardUrl;
|
|
||||||
|
|
||||||
return array_filter($context);
|
return array_filter($context);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue