Merge branch 'master' into testing

2010-02-22 11:04:11 -05:00 · 2010-02-22 11:04:11 -05:00 · 13ad48fab3
commit 13ad48fab3
parent 2f65fa646a 5a6967db6c
1 changed files with 4 additions and 0 deletions
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@ -285,6 +285,10 @@ class ProfilesettingsAction extends AccountSettingsAction
                } else {
                    // Re-initialize language environment if it changed
                    common_init_language();
+                    // Clear the site owner, in case nickname changed
+                    if ($user->hasRole(Profile_role::OWNER)) {
+                        User::blow('user:site_owner');
+                    }
                }
            }