diff --git a/core/i18n.php b/core/i18n.php index db65eaa7c..2538bccf0 100755 --- a/core/i18n.php +++ b/core/i18n.php @@ -1726,7 +1726,8 @@ class i18n extends Object { } /** - * Get the current locale + * Get the current locale. + * Used by {@link Member::populateDefaults()} * * @return string Current locale in the system */ diff --git a/security/Member.php b/security/Member.php index ef83649f5..296c4aba0 100755 --- a/security/Member.php +++ b/security/Member.php @@ -110,13 +110,12 @@ class Member extends DataObject { */ protected static $login_marker_cookie = null; - /** * Ensure the locale is set to something sensible by default. */ public function populateDefaults() { parent::populateDefaults(); - $this->Locale = i18n::default_locale(); + $this->Locale = i18n::get_locale(); } function requireDefaultRecords() { @@ -646,7 +645,7 @@ class Member extends DataObject { ); // Overwrite the Password property with the hashed value -; $this->Password = $encryption_details['password']; + $this->Password = $encryption_details['password']; $this->Salt = $encryption_details['salt']; $this->PasswordEncryption = $encryption_details['algorithm']; @@ -665,7 +664,7 @@ class Member extends DataObject { if(!$this->Locale) { $this->Locale = i18n::get_locale(); } - + parent::onBeforeWrite(); }