Merge pull request #20 from t1mmen/master

Fixed 'contain' option not working.
FriendsOfCake · Jul 16, 2014 · 9e6e500 · 9e6e500
2 parents 39c9704 + 687c97f
commit 9e6e500
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Controller/Component/Auth/MultiColumnAuthenticate.php b/Controller/Component/Auth/MultiColumnAuthenticate.php
@@ -44,7 +44,8 @@ class MultiColumnAuthenticate extends FormAuthenticate {
 		),
 		'columns' => array(),
 		'userModel' => 'User',
-		'scope' => array()
+		'scope' => array(),
+		'contain' => null
 	);
 
 /**
@@ -72,13 +73,16 @@ protected function _findUser($username, $password = null) {
 		}
 		$result = ClassRegistry::init($userModel)->find('first', array(
 			'conditions' => $conditions,
-			'recursive' => 0
+			'recursive' => 0,
+			'contain' => $this->settings['contain'],
 		));
 		if (empty($result) || empty($result[$model])) {
 			return false;
 		}
-		unset($result[$model][$fields['password']]);
-		return $result[$model];
+		$user = $result[$model];
+		unset($user[$fields['password']]);
+		unset($result[$model]);
+		return array_merge($user, $result);
 	}
 
 }