adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing reversed args.

Browse source
This commit is contained in:
mark_story 2011-02-01 21:24:46 -05:00
parent 5834225cc3
commit 9854947d0f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/controller/components/auth.php
View file

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