diff options
| author | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
| commit | b8001ea1079c4c8895fd2323e1e4a47c0d71fde3 (patch) | |
| tree | b732b239bf790c78c90f4c7d3be7044ce9f7da45 /actions/grouplogo.php | |
| parent | e3c4b0c85d3fbae9604b22d3666fe36a3c1c7551 (diff) | |
| parent | 064c45890f896f2af8a0231449fa5337bb79c509 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/grouplogo.php')
| -rw-r--r-- | actions/grouplogo.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 3c9b56296..f414a23cc 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -92,7 +92,10 @@ class GrouplogoAction extends GroupDesignAction if ($groupid) { $this->group = User_group::staticGet('id', $groupid); } else { - $this->group = User_group::staticGet('nickname', $nickname); + $local = Local_group::staticGet('nickname', $nickname); + if ($local) { + $this->group = User_group::staticGet('id', $local->group_id); + } } if (!$this->group) { |