Merge branch 'master' into testing

This commit is contained in:
Evan Prodromou 2010-02-22 11:04:11 -05:00
commit 13ad48fab3

View File

@ -285,6 +285,10 @@ class ProfilesettingsAction extends AccountSettingsAction
} else { } else {
// Re-initialize language environment if it changed // Re-initialize language environment if it changed
common_init_language(); common_init_language();
// Clear the site owner, in case nickname changed
if ($user->hasRole(Profile_role::OWNER)) {
User::blow('user:site_owner');
}
} }
} }