summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-22 11:04:11 -0500
committerEvan Prodromou <evan@status.net>2010-02-22 11:04:11 -0500
commit13ad48fab3b64e9c8376761b55caa1e19a49934b (patch)
treee4feaf58c54e0c8c1a6f131777f61dac0d9614cd
parent2f65fa646acc9a0739e779de9e472b9957c2e7eb (diff)
parent5a6967db6cbe0e864c8d542700008bba99a7b095 (diff)
Merge branch 'master' into testing
-rw-r--r--actions/profilesettings.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 0d6777879..161e35b11 100644
--- 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');
+ }
}
}