Merge branch 'master' into 2.4

This commit is contained in:
mark_story 2013-06-29 23:26:26 -04:00
commit f09693f6e8
22 changed files with 147 additions and 30 deletions
lib/Cake/Model/Datasource

View file

@ -280,7 +280,7 @@ class DboSource extends DataSource {
/**
* Disconnects from database.
*
* @return boolean True if the database could be disconnected, else false
* @return boolean Always true
*/
public function disconnect() {
if ($this->_result instanceof PDOStatement) {