mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
ENHANCEMENT New Member records are populated with the currently set default through i18n::set_locale() (from r108499)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112753 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
50e9025bbb
commit
60c78eb54d
@ -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
|
||||
*/
|
||||
|
@ -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'];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user