mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 02:26:17 +00:00
Changing recursive setting in Auth user lookup query, allows $userScope to use joins, fixes #4665
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6919 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
a33cfd0b98
commit
8313fef72d
2 changed files with 2 additions and 3 deletions
|
@ -747,7 +747,7 @@ class AuthComponent extends Object {
|
|||
return false;
|
||||
}
|
||||
$model =& $this->getModel();
|
||||
$data = $model->find(array_merge($find, $conditions), null, null, -1);
|
||||
$data = $model->find(array_merge($find, $conditions), null, null, 0);
|
||||
if (empty($data) || empty($data[$this->userModel])) {
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -168,9 +168,8 @@ class AuthTest extends CakeTestCase {
|
|||
}
|
||||
|
||||
$this->Controller =& new AuthTestController();
|
||||
restore_error_handler();
|
||||
|
||||
$this->Controller->_initComponents();
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
ClassRegistry::addObject('view', new View($this->Controller));
|
||||
$this->Controller->Session->del('Auth');
|
||||
$this->Controller->Session->del('Message.auth');
|
||||
|
|
Loading…
Add table
Reference in a new issue