diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:08 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:08 -0800 |
| commit | b331e971b055386a126aaec27d661f26ba3b813c (patch) | |
| tree | 2104caeb4ef8b80d08490b598e73148e2883a637 | |
| parent | d9d1a77bb02227e6e79392959643404391df2ea0 (diff) | |
| parent | 6ae39da198e391f57a901e24a2561e76afe11613 (diff) | |
Merge branch 'master' into testing
| -rw-r--r-- | actions/editgroup.php | 2 | ||||
| -rw-r--r-- | classes/statusnet.ini | 3 | ||||
| -rw-r--r-- | lib/apiaction.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/actions/editgroup.php b/actions/editgroup.php index d486db0c0..4b596cade 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -286,7 +286,7 @@ class EditgroupAction extends GroupDesignAction $group = Local_group::staticGet('nickname', $nickname); if (!empty($group) && - $group->id != $this->group->id) { + $group->group_id != $this->group->id) { return true; } diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 719dbedf5..3fb8ee208 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -55,6 +55,7 @@ modified = 384 [conversation__keys] id = N +uri = U [deleted_notice] id = 129 @@ -102,6 +103,7 @@ modified = 384 [file__keys] id = N +url = U [file_oembed] file_id = 129 @@ -385,6 +387,7 @@ modified = 384 [oauth_application__keys] id = N +name = U [oauth_application_user] profile_id = 129 diff --git a/lib/apiaction.php b/lib/apiaction.php index d79dc327e..2af150ab9 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1248,7 +1248,7 @@ class ApiAction extends Action if (empty($local)) { return null; } else { - return User_group::staticGet('id', $local->id); + return User_group::staticGet('id', $local->group_id); } } } |