From 0d373a0c16d20850d94e943f3def3a69da198a8b Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Wed, 4 Apr 2007 08:36:00 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4756]
Adding fix for Ticket #2343
Corrected test case for InflectorTest:testInflectingPlurals() house, original test used wrong method from Inflector

Revision: [4755]
Adding fix to EmailComponent::_ _createHeader() that corrects addresses that are set in CC being added to BCC also

Revision: [4754]
Adding check for config/inflections.php back to Inflector

Revision: [4752]
Adding fix for Ticket #2339
Adding fix for Ticket #2335
Adding fix for Ticket #2344

Merged changes in dbo from 1.2 to 1.1
Merged changes to session handling in 1.2 to 1.1
Merged changes to Model::_ _saveMulti() in 1.2 to 1.1
Added Set::pushDiff() to append differences in array 2 to array 1
Added SessionComponent::activate() and SessionHelper::activate() to turn sessions usage on if AUTO_SESSION is set to false
Added test for Ticket #2343
Added change to AclNode to use correct table naming
Added garbage clean up to CakeSession::_ _close(); some installs, like Debian, have removed garbage clean
up and use a cron job instead. Currently this change is only supported for database session.

Revision: [4751]
Removing unnecessary requirements

Revision: 4750
Removing unnecessary requirements

Revision: [4749]
Implementing AclNodeTest through fixtures

Revision: [4748]
Adding test to reproduce ticket #2343

Revision: [4747]
Adding fix from Ticket #2336

Revision: [4746]
fixing check in magic methods for a value otherwise it will return false adding test to dbosource

Revision: [4745]
Adding fix for Ticket #2328

Revision: [4744]
Adding test for Ticket #2333.
Added fix for Ticket #2333

Revision: [4743]
Adding var $layout to EmailComponent

Revision: [4742]
Fixing EmailComponent::_ _formatAddress() was not returning $string

Revision: [4741]
Refactoring AuthComponent password hashing

Revision: [4740]
fixing router when affected by requestAction #2319, adding check in magic methods for a value otherwise it will return false

Revision: [4738]
Added test in testGenerateAssociationQuerySelfJoinWithConditions() to replicate issue when 'conditions' is not used after doing bindModel() for a $belongsTo relation

Revision: [4737]
Simplified failing test in model.test.php

Revision: [4736]
Simplified failing test in model.test.php

Revision: [4735]
Adding Ajax rendering fix for Ticket #2323

Revision: [4734]
Adding test for #2325

Revision: [4733]
Fixing Controller::cleanUpFields() formatting bug introduced in [4596] (Ticket #2322)

Revision: [4732]
Adding fix for TIcket #2325

Revision: [4731]
Adding patch from ticket #2324 plus test

Revision: [4730]
Adding patch from Ticket #2320

Revision: [4729]
Additional timestamp fix for Controller::cleanUpFields()

Revision: [4728]
Fixing typos

Revision: [4727]
Misc. fixes to DboPostgres, added basic schema generation, and fixed getting insert IDs from sequence (Ticket #2309)

Revision: [4726]
Refactoring FormHelper and fixing 'empty' option for date/time elements in FormHelper::input() (Ticket #2311)

Revision: [4725]
Fixed typo in function name

Revision: [4724]
Identified line that allows bakery issue test to succeed

Revision: [4723]
Added test that replicates issue in bakery with nested models after doing some bindModel() and unbindModel()

Revision: [4722]
Fixing Controller::cleanUpFields() to handle timestamp fields, and properly unset meridian values

Revision: [4721]
Added test for ticket #2321

Revision: [4720]
Adding Model::saveField() fix for triggering invalid hasAndBelongsToMany saves

Revision: [4719]
Moving session flash rendering from component to helper (fixes errors when using setFlash() in beforeFilter)

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4758 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 959b864ac..90a964475 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4718alpha
\ No newline at end of file
+1.2.0.4758alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 85542a3bd..458480400 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.4718alpha';
+$config['Cake.version'] = '1.2.0.4758alpha';
 ?>
\ No newline at end of file