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

Merge pull request #1812 from willmorgan/patch-1

Browse Source 
Use correct config variable name in encrypt_password
This commit is contained in:
Will Rossiter 2013-04-27 14:28:57 -07:00
commit 2e227ef6ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/Security.php
View File

@ -808,7 +808,7 @@ class Security extends Controller {
public static function set_password_encryption_algorithm($algorithm) { public static function set_password_encryption_algorithm($algorithm) {
Deprecation::notice('3.2', 'Use the "Security.password_encryption_algorithm" config setting instead'); Deprecation::notice('3.2', 'Use the "Security.password_encryption_algorithm" config setting instead');
self::config()->encryption_algorithm = $algorithm; self::config()->password_encryption_algorithm = $algorithm;
} }
/** /**
@ -817,7 +817,7 @@ class Security extends Controller {
*/ */
public static function get_password_encryption_algorithm() { public static function get_password_encryption_algorithm() {
Deprecation::notice('3.2', 'Use the "Security.password_encryption_algorithm" config setting instead'); Deprecation::notice('3.2', 'Use the "Security.password_encryption_algorithm" config setting instead');
return self::config()->encryption_algorithm; return self::config()->password_encryption_algorithm;
} }
/** /**
@ -849,7 +849,7 @@ class Security extends Controller {
*/ */
public static function encrypt_password($password, $salt = null, $algorithm = null, $member = null) { public static function encrypt_password($password, $salt = null, $algorithm = null, $member = null) {
// Fall back to the default encryption algorithm // Fall back to the default encryption algorithm
if(!$algorithm) $algorithm = self::config()->encryption_algorithm; if(!$algorithm) $algorithm = self::config()->password_encryption_algorithm;
$e = PasswordEncryptor::create_for_algorithm($algorithm); $e = PasswordEncryptor::create_for_algorithm($algorithm);