Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Brion Vibber 2011-03-04 13:41:01 -08:00
commit d8e30fa495

View File

@ -127,7 +127,7 @@ class ActivityStreamJSONDocument
function addLink($url = null, $rel = null, $mediaType = null)
{
$link = new ActivityStreamsLink($url, $rel, $mediaType);
$this->doc['link'][] = $link->asArray();
$this->doc['links'][] = $link->asArray();
}
/*