diff options
author | Zach Copley <zach@status.net> | 2010-03-03 13:06:20 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-03-03 13:06:20 -0800 |
commit | 43de781e43d54e1b80f15f0a5d6568e1f2ab86ac (patch) | |
tree | 5a9d30e0a1ab71d7bf7c6f7f05840f90b8ea2da6 /actions/apitimelinegroup.php | |
parent | 339b0b0a4d506638b7b3457db295ab7969e2a9df (diff) | |
parent | c04c8ae59a7953a21cc464a49b657dfdc926e009 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
quick fix: skip notice from unused variable on group atom feed generation
Avoid notice on local group creation when uri isn't passed in at create time (needs to be generated)
Diffstat (limited to 'actions/apitimelinegroup.php')
-rw-r--r-- | actions/apitimelinegroup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index d0af49844..e30a08fb5 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction // @todo set all this Atom junk up inside the feed class - $atom->setId($id); + #$atom->setId($id); $atom->setTitle($title); $atom->setSubtitle($subtitle); $atom->setLogo($logo); |