summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-17 10:14:08 -0800
committerBrion Vibber <brion@pobox.com>2010-02-17 10:14:08 -0800
commit5a6cbb248f8cdcb171ea5540e6a6c2eb10506a82 (patch)
treec72830bef3388b1ceb19cc6ef688177122961435 /actions
parent46e9aa13aa87955b441bc63b7cf2f58622b131b0 (diff)
parent3cb6b1670bd7e3860fdca217e4075f51378fe5e0 (diff)
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'actions')
-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':