From e56318d07fe3cabcace5c4597c660260f80a0e00 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 22 Jan 2010 01:48:03 -0800 Subject: Don't try to access ORM::$changed externally; it's protected. --- modules/user/controllers/users.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index b1c05efa..b1ac1944 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -32,7 +32,12 @@ class Users_Controller extends Controller { $user->password = $form->edit_user->password->value; $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; - $user->locale = $form->edit_user->locale->value; + + if ($user->locale != $form->edit_user->locale->value) { + $user->locale = $form->edit_user->locale->value; + $flush_locale_cookie = true; + } + $user->validate(); } catch (ORM_Validation_Exception $e) { // Translate ORM validation errors into form error messages @@ -43,7 +48,7 @@ class Users_Controller extends Controller { } if ($valid) { - if (isset($user->changed["locale"])) { + if (isset($flush_locale_cookie)) { // Delete the session based locale preference setcookie("g_locale", "", time() - 24 * 3600, "/"); } -- cgit v1.2.3