Skip to content

Commit

Permalink
Removing a method that is duplicated in AuthComponent.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Feb 4, 2011
1 parent 9854947 commit 3875d0e
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions cake/libs/controller/components/auth/base_authenticate.php
Expand Up @@ -49,16 +49,6 @@ public function __construct($settings) {
$this->settings = Set::merge($this->settings, $settings);
}

/**
* Hash the supplied password using the configured hashing method.
*
* @param string $password The password to hash.
* @return string Hashed string
*/
public function hash($password) {
return Security::hash($password, null, true);
}

/**
* Find a user record using the standard options.
*
Expand All @@ -73,7 +63,7 @@ protected function _findUser($username, $password) {

$conditions = array(
$model . '.' . $fields['username'] => $username,
$model . '.' . $fields['password'] => $this->hash($password),
$model . '.' . $fields['password'] => AuthComponent::password($password),
);
if (!empty($this->settings['scope'])) {
$conditions = array_merge($conditions, $this->settings['scope']);
Expand Down

0 comments on commit 3875d0e

Please sign in to comment.