Browse Source

Remove deprecation

Mark Scherer 10 years ago
parent
commit
4b46079b5f
1 changed files with 3 additions and 2 deletions
  1. 3 2
      Model/Behavior/PasswordableBehavior.php

+ 3 - 2
Model/Behavior/PasswordableBehavior.php

@@ -433,10 +433,11 @@ class PasswordableBehavior extends ModelBehavior {
 		}
 
 		$primaryKey = $Model->data[$Model->alias][$Model->primaryKey];
-		$dbValue = $Model->field($field, [$Model->primaryKey => $primaryKey]);
-		if (!$dbValue && $pwd) {
+		$record = $Model->find('first', ['conditions' => [$Model->primaryKey => $primaryKey]]);
+		if (empty($record[$Model->alias][$field]) && $pwd) {
 			return false;
 		}
+		$dbValue = $record[$Model->alias][$field];
 
 		if ($type === 'blowfish' && function_exists('password_hash') && !empty($this->settings[$Model->alias]['passwordHasher'])) {
 			$value = $pwd;