Fixing reversed args.

This commit is contained in:
mark_story 2011-02-01 21:24:46 -05:00
parent 5834225cc3
commit 9854947d0f

View file

@ -627,7 +627,7 @@ class AuthComponent extends Component {
if (!method_exists($className, 'authenticate')) {
throw new CakeException(__('Authentication objects must implement an authenticate method.'));
}
$settings = array_merge((array)$settings, $global);
$settings = array_merge($global, (array)$settings);
$this->_authenticateObjects[] = new $className($settings);
}
return $this->_authenticateObjects;