When changing user preferences, reset the session based locale preferences.

1 files changed, 6 insertions, 1 deletions

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 0bf2e81d..4ad704f0 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -36,7 +36,12 @@ class Users_Controller extends REST_Controller {
       $user->url = $form->edit_user->url->value;
       if ($form->edit_user->locale) {
         $desired_locale = $form->edit_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+        $new_locale = $desired_locale == "none" ? null : $desired_locale;
+        if ($new_locale != $user->locale) {
+          // Delete the session based locale preference
+          setcookie("g_locale", "", time() - 24 * 3600, "/");
+        }
+        $user->locale = $new_locale;
       }
       $user->save();
       module::event("user_edit_form_completed", $user, $form);