Merging fixes into the trunk:

Revision: [4802]
Refactoring duplicate code into one method

Revision: [4801]
Adding fixes for Ticket #2357, Ticket #2358
Added tests from Ticket #2357, Ticket #2358
Fixed failing DboSourceTest:
source:/branches/1.2.x.x/cake/tests/cases/libs/model/datasources/dbo_source.test.php@4778#L1080

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4804 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-04-06 12:38:06 +00:00
parent aaa2e3cf21
commit 847cf2345f
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.4798alpha
1.2.0.4804alpha

View file

@ -24,5 +24,5 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
$config['Cake.version'] = '1.2.0.4798alpha';
$config['Cake.version'] = '1.2.0.4804alpha';
?>