diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-24 15:47:51 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-24 15:47:51 -0800 |
| commit | 59be4b8cae992476628b23c2976d335e4f704c89 (patch) | |
| tree | a1e94f2b11a5e640bf55f6977576fdca237f323f /actions/apitimelinegroup.php | |
| parent | 2d9d444b05e29105082d3a443b8b71de6498b7e9 (diff) | |
| parent | e04f55630473f5f8b17554d14cfd047b93af8609 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/apitimelinegroup.php')
| -rw-r--r-- | actions/apitimelinegroup.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 1d0c4afdd..0bb4860ea 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -176,7 +176,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $atom->addEntryFromNotices($this->notices); - $this->raw($atom->getString()); + //$this->raw($atom->getString()); + print $atom->getString(); // temp hack until PuSH feeds are redone cleanly } catch (Atom10FeedException $e) { $this->serverError( |