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 /actions | |
| parent | d9d1a77bb02227e6e79392959643404391df2ea0 (diff) | |
| parent | 6ae39da198e391f57a901e24a2561e76afe11613 (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/editgroup.php | 2 |
1 files changed, 1 insertions, 1 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; } |