From a0bc69adb8939f684298a2966d9915ca64baf326 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 30 Apr 2007 13:37:19 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4952]
Added variation for a field parsing test

Revision: [4951]
Adding test for field parsing

Revision: [4950]
Adding tests for #2506

Revision: [4949]
Fixing overriding of default messages

Revision: [4948]
Adding overriding error messages when multiple rules

Revision: [4947]
Adding Xcache support http://trac.lighttpd.net/xcache/

Revision: [4946]
Adding fix for failing ajax tests

Revision: [4945]
Adding fix when mysql_connect is set as a connection in the database config and persistent key is not set in the config, the default for persistent is true and this would override the settings in the database config

Revision: [4944]
Adding a check to prevent if $test is not defined in DATABASE_CONFIG

Revision: [4943]
Fixed tests for PHP4

Revision: [4942]
Fixing assigned by reference on php 4

Revision: [4941]
Fixing assigned by reference on php 4, removing reference in Cache::engine()

Revision: [4940]
Making changes to cache classes and rearranging code to use new cache

Revision: [4939]
Adding return false when Memcache is set as the cache engine and the memcache extension is not installed.

Revision: [4938]
Changing settings used for new caching in core.php

Revision: [4937]
Renaming files _engine was redundant

Revision: [4936]
Refactoring new cache classes

Revision: [4935]
Fixing Model::invalidFields to account for '0' in empty checks

Revision: [4934]
Changing 'allowEmpty' for model validation, adding 'required' and enabling multiple rules per field

Revision: [4933]
Adding initial implementation of extended caching capabilities

Revision: [4932]
Adding fix for Controller::modelClass; name when var $uses; is not the same as the Controllers singular name.
This is now set to the first value of the key $uses[0] if multiple models are added to var $uses;

Revision: [4931]
Adding fix for #2505, fixes Recursive delete in self joined models

Revision: [4929]
Fixing bug with first level validation not showing

Revision: [4928]
fixing theme view layout and element paths #2388

Revision: [4927]
Adding fix for #2452 (patch from #2476).
Added tests for ticket #2452

Revision: [4926]
Added fix for #2453, fixes HtmlHelper link escape title as string

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4955 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 3ac7f80b0..7c6033454 100644
--- a/cake/VERSION.txt
+++ b/cake/VERSION.txt
@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4925alpha
\ No newline at end of file
+1.2.0.4955alpha
\ No newline at end of file
diff --git a/cake/config/config.php b/cake/config/config.php
index 9963d7860..0a3e56890 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.4925alpha';
+$config['Cake.version'] = '1.2.0.4955alpha';
 ?>
\ No newline at end of file