GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-26 12:40:59 -05:00
commit fc576562a3
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/editgroup.php
View File

@ -286,7 +286,7 @@ class EditgroupAction extends GroupDesignAction
$group = Local_group::staticGet('nickname', $nickname); $group = Local_group::staticGet('nickname', $nickname);
if (!empty($group) && if (!empty($group) &&
$group->id != $this->group->id) { $group->group_id != $this->group->id) {
return true; return true;
} }

3
classes/statusnet.ini
View File

@ -55,6 +55,7 @@ modified = 384
[conversation__keys] [conversation__keys]
id = N id = N
uri = U
[deleted_notice] [deleted_notice]
id = 129 id = 129
@ -102,6 +103,7 @@ modified = 384
[file__keys] [file__keys]
id = N id = N
url = U
[file_oembed] [file_oembed]
file_id = 129 file_id = 129
@ -385,6 +387,7 @@ modified = 384
[oauth_application__keys] [oauth_application__keys]
id = N id = N
name = U
[oauth_application_user] [oauth_application_user]
profile_id = 129 profile_id = 129

2
lib/apiaction.php
View File

@ -1248,7 +1248,7 @@ class ApiAction extends Action
if (empty($local)) { if (empty($local)) {
return null; return null;
} else { } else {
return User_group::staticGet('id', $local->id); return User_group::staticGet('id', $local->group_id);
} }
} }
} }