Merging fixes into the trunk:

Revision: 4423
Author: phpnut
Date: 8:32:42 PM, Friday, February 02, 2007
Message:
Adding fix for #1989
----
Modified : /branches/1.2.x.x/cake/libs/router.php


Revision: [4422]
Adding fix for #2018

Revision: [4420]
Adding additional fix for #1994

Revision: [4419]
Adding changes to Router to pass tests cases

Revision: [4417]
Adding page # fix for PaginatorHelper::counter() (Ticket #1994)

Revision: [4416]
Adding SQL Server column aliasing fix for hasMany/HABTM associations (Ticket #1931)

Revision: [4415]
Merging changes made to app/webroot/index.php to cake/scripts/templates/skel/webroot/index.php

Revision: [4414]
Merging changes made to app/webroot/index.php to cake/scripts/templates/skel/webroot/index.php

Revision: [4413]
Added missing return in Model::invalidFields()

Revision: [4412]
Adding fix for #1936

Revision: [4411]
Adding numeric value quoting fix for DboSource (Ticket #1927)

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4425 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-02-03 03:02:14 +00:00
parent 0c9c0e44b4
commit 381bd36c94
2 changed files with 2 additions and 2 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.2.0.4410alpha
1.2.0.4425alpha

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.4410alpha';
$config['Cake.version'] = '1.2.0.4425alpha';
?>