Browse files

Applying patch from 'Justas Butkus' to DboSource

Fixes issues where reconnect could issue warnings related to
array_merge.  Fixes #1182
  • Loading branch information...
1 parent 5e454c1 commit 77f05ab464a8d2c38b5a4e25394c9e6a76286561 @markstory markstory committed Oct 11, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 cake/libs/model/datasources/dbo_source.php
View
2 cake/libs/model/datasources/dbo_source.php
@@ -105,7 +105,7 @@ function __construct($config = null, $autoConnect = true) {
* @param array $config An array defining the new configuration settings
* @return boolean True on success, false on failure
*/
- function reconnect($config = null) {
+ function reconnect($config = array()) {
$this->disconnect();
$this->setConfig($config);
$this->_sources = null;

0 comments on commit 77f05ab

Please sign in to comment.