Merge branch 'master' into 2.3

Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
This commit is contained in:
mark_story 2012-11-10 21:33:26 -05:00
commit e0aab77dab
20 changed files with 127 additions and 90 deletions

View file

@ -2916,6 +2916,10 @@ class DboSource extends DataSource {
}
$statement->execute();
$statement->closeCursor();
if ($this->fullDebug) {
$this->logQuery($sql, $value);
}
}
return $this->commit();
}