summaryrefslogtreecommitdiff
path: root/actions/apitimelineuser.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-18 06:36:47 -0500
committerEvan Prodromou <evan@status.net>2010-02-18 06:36:47 -0500
commitb6e5d4ecc39aa0ee8618e2907aa3ad8f4e9af8a5 (patch)
treeb45314ad86becbda16fb475ac36d1431492069dd /actions/apitimelineuser.php
parent80ef3946d016eeeef1682e73eddffb222d8db149 (diff)
parent07f145049e8f0de848255d7b21ddb64866db0c83 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/apitimelineuser.php')
-rw-r--r--actions/apitimelineuser.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 24752e45f..9f7ec4c23 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -196,7 +196,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$atom->addEntryFromNotices($this->notices);
- $this->raw($atom->getString());
+ #$this->raw($atom->getString());
+ print $atom->getString(); // temporary for output buffering
break;
case 'json':