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

Fix for PHP notice spew in group creation via API: set default 'mainpage' in User_group::register() rather than forcing all callers to do it manually.

Browse Source
This commit is contained in:
Brion Vibber 2011-01-06 13:22:08 -08:00
parent 4b29d0ebb6
commit 281076d5f6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/newgroup.php
View File

@ -200,8 +200,6 @@ class NewgroupAction extends Action
} }
} }
$mainpage = common_local_url('showgroup', array('nickname' => $nickname));
$cur = common_current_user(); $cur = common_current_user();
// Checked in prepare() above // Checked in prepare() above
@ -215,7 +213,6 @@ class NewgroupAction extends Action
'location' => $location, 'location' => $location,
'aliases' => $aliases, 'aliases' => $aliases,
'userid' => $cur->id, 'userid' => $cur->id,
'mainpage' => $mainpage,
'local' => true)); 'local' => true));
common_redirect($group->homeUrl(), 303); common_redirect($group->homeUrl(), 303);

4
classes/User_group.php
View File

@ -487,6 +487,7 @@ class User_group extends Memcached_DataObject
} }
// MAGICALLY put fields into current scope // MAGICALLY put fields into current scope
// @fixme kill extract(); it makes debugging absurdly hard
extract($fields); extract($fields);
@ -498,6 +499,9 @@ class User_group extends Memcached_DataObject
// fill in later... // fill in later...
$uri = null; $uri = null;
} }
if (empty($mainpage)) {
$mainpage = common_local_url('showgroup', array('nickname' => $nickname));
}
$group->nickname = $nickname; $group->nickname = $nickname;
$group->fullname = $fullname; $group->fullname = $fullname;