summaryrefslogtreecommitdiff
path: root/actions/apitimelinefriends.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-27 14:57:32 -0700
committerBrion Vibber <brion@pobox.com>2010-05-27 14:57:32 -0700
commit696aeea113b88fd0f6b7c4c88eebc2f4f369d245 (patch)
treec16f91a270c2989f8e6b3799b2dfa3e39698f565 /actions/apitimelinefriends.php
parentcc25ec175530a691686087db4c23a1a28ffd1b62 (diff)
parent2f2fa100715f9c09b2b91a2d1afddacf7b7f16db (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts: lib/language.php plugins/OpenID/finishaddopenid.php
Diffstat (limited to 'actions/apitimelinefriends.php')
-rw-r--r--actions/apitimelinefriends.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 3c25c049e..a3340ff46 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -248,7 +248,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
header('Content-Type: application/atom+xml; charset=utf-8');
- $atom = new AtomNoticeFeed();
+ $atom = new AtomNoticeFeed($this->auth_user);
$atom->setId($id);
$atom->setTitle($title);