Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
d8e30fa495
@ -127,7 +127,7 @@ class ActivityStreamJSONDocument
|
|||||||
function addLink($url = null, $rel = null, $mediaType = null)
|
function addLink($url = null, $rel = null, $mediaType = null)
|
||||||
{
|
{
|
||||||
$link = new ActivityStreamsLink($url, $rel, $mediaType);
|
$link = new ActivityStreamsLink($url, $rel, $mediaType);
|
||||||
$this->doc['link'][] = $link->asArray();
|
$this->doc['links'][] = $link->asArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user