tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT New Member records are populated with the currently set default through i18n::set_locale() (from r108499)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112753 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-19 00:37:43 +00:00
parent 50e9025bbb
commit 60c78eb54d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/i18n.php
View File

@ -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
*/

7
security/Member.php
View File

@ -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();
}