Don't get User model if not needed. Fixes #563

Signed-off-by: Mark Story <mark@mark-story.com>
cakephp · Apr 10, 2010 · 1c5898d · 1c5898d
1 parent ceb2a1d
commit 1c5898d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
@@ -922,10 +922,13 @@ function hashPasswords($data) {
 			return $this->authenticate->hashPasswords($data);
 		}
 
-		$model =& $this->getModel();
-		if (is_array($data) && isset($data[$model->alias])) {
-			if (isset($data[$model->alias][$this->fields['username']]) && isset($data[$model->alias][$this->fields['password']])) {
-				$data[$model->alias][$this->fields['password']] = $this->password($data[$model->alias][$this->fields['password']]);
+		if (is_array($data)) {
+			$model =& $this->getModel();
+
+			if(isset($data[$model->alias])) {
+				if (isset($data[$model->alias][$this->fields['username']]) && isset($data[$model->alias][$this->fields['password']])) {
+					$data[$model->alias][$this->fields['password']] = $this->password($data[$model->alias][$this->fields['password']]);
+				}
 			}
 		}
 		return $data;