Commit d8e30fa4 authored by Brion Vibber's avatar Brion Vibber

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

parents 56d5c4a4 8dbbee92
......@@ -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();
}
/*
......
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