From 0f2e3a4a8004949f1123979e8c00983525c6e759 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 12 Apr 2007 08:59:09 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4851]
Adding patch from Ticket #2374

Revision: [4850]
Correcting [4849], would attempt to load non existent model is var $uses was not set

Revision: [4849]
Adding fix for Ticket #2349

Revision: [4848]
Adding fix for Ticket #2392
Added tests for this fix.

Revision: [4847]
Fixing SQL error in AuthComponent::identify() when username is empty (Ticket #2402)

Revision: [4846]
Fixing (moving) session string warning (Ticket #2377) and adding automatic logging code

Revision: [4845]
Adding fix for Ticket #2376

Revision: [4843]
Added tests for issue #2391

Revision: [4842]
Added tests for issue #2391

Revision: [4841]
Adding fix for Ticket #2380

Revision: [4840]
Adding fix for Ticket #2391

Revision: [4839]
Adding fix for Ticket #2387
Fixed issue in view with $session->valid() always returning false.

Revision: [4838]
Fixing JavascriptHelper::object() bug with numeric indexes, as reported on the mailing list

Revision: [4837]
Throwing Missing Model error for missing associated classes, per gwoo

Revision: [4835]
Adding fix for Ticket #2326

Revision: [4834]
Removing inline comments and fixing error in parseURI; also fixes Ticket #2382

Revision: [4833]
Adding user check fix for AuthComponent::isAuthorized(), and removing comments from Model test (Ticket #2381)

Revision: [4832]
Fixed typo in function name strpos replaces strrpos

Revision: [4831]
Refactoring association joins, Fixes the issue with adding the Model.id if it is not already added.
Adding fix for string based fields.

Revision: [4830]
Removing name() method from DBO drivers (Ticket #2372)

Revision: [4829]
Adding tests to force foreignKey fields in hasMany

Revision: [4828]
Adding tests for automatic addition of ids in hasMany

Revision: [4827]
Adding fix for undefined index

Revision: [4826]
Adding first implementation of hasMany associations using one select statement.

Revision: [4825]
Removing some duplicate code

Revision: [4824]
Initial work on using one select statement for hasMany associations

Revision: [4823]
Adding enhancement from Ticket #2366

Revision: [4822]
Adding patch from Ticket #2368

Revision: [4821]
Moving fixtures directory in the application skeleton

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4853 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/VERSION.txt       | 2 +-
 cake/config/config.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/VERSION.txt b/cake/VERSION.txt
index fc877da85..e30f70249 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4820alpha
\ No newline at end of file
+1.2.0.4853alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 72b1d7516..c7c4f8d23 100644
--- a/cake/config/config.php
+++ b/cake/config/config.php
@@ -24,5 +24,5 @@
  * @lastmodified	$Date$
  * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-$config['Cake.version'] = '1.2.0.4820alpha';
+$config['Cake.version'] = '1.2.0.4853alpha';
 ?>
\ No newline at end of file