eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source 
* '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)
This commit is contained in:
Zach Copley 2010-03-03 13:06:20 -08:00
commit 43de781e43
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/apitimelinegroup.php
View File

@ -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);

5
classes/User_group.php
View File

@ -456,6 +456,11 @@ class User_group extends Memcached_DataObject
$group->query('BEGIN');
if (empty($uri)) {
// fill in later...
$uri = null;
}
$group->nickname = $nickname;
$group->fullname = $fullname;
$group->homepage = $homepage;