From 4f04f09978c38416bc7b51286ce84f167361916d Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 5 Apr 2007 18:10:39 +0000
Subject: [PATCH] Merging fixes into the trunk:

Revision: [4785]
Adding fix for Ticket #2347

Revision: [4784]
Adding fix for Ticket #2317.
Added ability to cache queries to Model::query() by passing true as a second param.
Before this method would turn off caching automatically and there was no way to turn it on.

Revision: [4783]
Adding fix for Ticket #2351

Revision: [4782]
Adding fix for Ticket #2349

Revision: [4781]
Fixing typo

Revision: [4780]
Adding headers

Revision: [4779]
Adding new Set::merge() and Set class test case, thanks Felix

Revision: [4778]
Fixing [Only variable references should be returned by reference]

Revision: [4777]
Remove deprecated methods from test cases

Revision: [4776]
finishing changes to FormHelper

Revision: [4775]
Preventing session started messages in session test

Revision: [4774]
Removing old AclNodeTest methods this code is no longer valid on 1.2

Revision: [4773]
Added test for combination of self joins and belongsTo

Revision: [4771]
Fixed test to used array based self join

Revision: [4770]
Adding fix for to correct additional 1:1 associations failing to query when there is a self join association.

Revision: [4769]
fixing some changes to FormHelper

Revision: [4768]
Removing preg_replace() and adding additional param $where = true to DboSource::conditions()

Revision: [4767]
Fixing self association joins with conditions and fields

Revision: [4766]
Fixed test

Revision: [4765]
Fixed test

Revision: [4764]
Fixed tests to include parenthesis used in ON clauses

Revision: [4763]
Adding fixes for association conditions

Revision: [4762]
adding fix to FormHelper::create() for plugin path with action, see #2342. Adding default sizes, maxlengths, and values to input. FormHelper::inputs() will now return all the fields in the model without the need to pass anything from the controller, uses a blacklist so some fields can be skipped. Added PaginatorHelper::numbers(),  will output current page numbers, uses a modulus to decide how many to show on each side of the current page. Paginator::options() now allows setting default paging params

Revision: [4761]
Adding fix for ModelTest::testRecursiveFindAll()

Revision: [4760]
Commenting debug code in model.test.php

Revision: [4759]
Adding fix for scaffold when using self associated HABTM

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