diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
| commit | 8dfc8f1635940b096e7f4025e3aef0ca4f909eb2 (patch) | |
| tree | 9fce4aa765d56496031698f219da2f0f82b33e80 /actions/grouplogo.php | |
| parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
| parent | b331e971b055386a126aaec27d661f26ba3b813c (diff) | |
Merge branch 'testing' 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) { |