summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
committerEvan Prodromou <evan@status.net>2010-02-26 12:40:59 -0500
commitfc576562a39943fb1fa83a6a6d1fdef4f234564a (patch)
tree9746f83e1f5b155cb7ebd07c4600428d37c18058 /actions
parent6781f95c733ed4d678fc4c09926efe195e590359 (diff)
parentb331e971b055386a126aaec27d661f26ba3b813c (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions')
-rw-r--r--actions/editgroup.php2
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;
}