Merging fixes into the trunk:

Revision: [4695]
Correcting headers in files.
Adding correct mime-type for files.
Formated code to conventions

Revision: [4694]
Refactoring RequestHandler

Revision: [4690]
Adding fix for Ticket #2295

Revision: [4689]
Adding test for Validate::ip().
Fixed Ticket #2298.
Fixed issue with I10n class not setting default language

Revision: [4688]
Forcing SQL debug mode for model tests

Revision: [4687]
Fixing issue in DboSource with left joins on self joins

Revision: [4686]
Fixing calculated field parsing for DboSource::fields()

Revision: [4685]
Reverting changes made in last revision

Revision: [4684]
Fixing SQL expression handling in Model::field() (TIcket #2283)

Revision: [4682]
Fixing token key regeneration on requestAction calls (Ticket #2282)

Revision: [4681]
Fixing query order in Controller::paginate() (Ticket #2201)

Revision: [4680]
Adding JavascriptHelper::object() fix for 0 being converted to null (Ticket #2296)

Revision: [4679]
Rewriting SQL generation for self-joins

Revision: [4678]
Patching SELECT query test in DboSource::fetchAll() (Ticket #2288)

Revision: [4677]
Disabling ORDER BY clause for Model::findCount (Ticket #2227) and updating test case

Revision: [4676]
Adding fix for Ticket #2291

Revision: [4675]
Fixing comments

Revision: [4674]
Adding fix for Ticket #2183

Revision: [4673]
Added fix for Ticket #2098

Revision: [4672]
Adding enhancement idea from Ticket #2201.
Fixed the use of parseHtmlOptions which is deprecated.
Fixed an undefined index on check box when there is no model.

Revision: [4671]
Adding fix for Ticket #2285

Revision: [4670]
Adding fix for Ticket #2287

Revision: [4669]
adding fix to bake for #2253: table prefixes and #2267: primary keys

Revision: [4668]
Adding headers to files.
Formating doc comments

Revision: [4667]
Adding changes to test suite submitted by Mariano

Revision: [4666]
Reformatting code comments

Revision: [4665]
Adding test for Validation::alphaNumeric() to check empty $check.
Corrected Validation::alphaNumeric() to return false if $this->check; is empty

Revision: [4664]
Fixing default input values for form inputs, and adding test case

Revision: [4663]
Fixing URL normalization for AuthComponent redirects

Revision: [4662]
Adding test cases for FormHelper::error()

Revision: [4661]
Added $config['database'] mysqli_connect() in DboMysqli::connect(), removed mysqli_select_db()

Revision: [4660]
Refactoring Helper::setFormTag()

Revision: [4659]
Corrected view tests.
Added fix for Ticket #2245
Refactored loading of components and helpers to allow for use of dot notation with plugins.

Revision: [4658]
Adding fix for Ticket #2239

Revision: [4657]
Adding fix for Ticket #2235

Revision: [4656]
Adding fix for Ticket #2214
Removed persistent connection setting in DboMysqli::connect() since there is no persistent connection function for mysqli

Revision: [4655]
Adding fix for #2210

Revision: [4654]
Adding fix for #2219

Revision: [4652]
Removed declaration of class variables as private...stuck in PHP 5 mode :)

Revision: [4651]
Added in some more skeletons for parsing out commands in the console

Revision: [4650]
fixing loadHelpers on renderElement, fixes Email too

Revision: [4649]
Fixing undefined variable in Router

Revision: [4648]
Fixing undefined variable in Router, updating Socket test, and fixing FormHelper::label() for dot notation (Ticket #2277)

Revision: [4647]
Fixing boolean conditions expression handling in DboSource::conditionKeysToString() and added test case (Ticket #2268)

Revision: [4646]
Updating Socket test to account for differences in local machine hosts files (Ticket #2053)

Revision: [4645]
Fixing unique script check in View::addScript() (Ticket #2262), and adding View test case

Revision: [4644]
Fixing redundant SQL condition generation in DboSource::conditionKeysToString(), fixing SQL ORDER parsing (Ticket #2266) and updating test cases

Revision: [4643]
Adding method to generate a random key for CAKE_SESSION_STRING when using bake

Revision: [4642]
Adding AppHelper to skel 

Revision: [4641]
Refactoring AuthComponent::hashPasswords()

Revision: [4640]
Implementing AuthComponent::$logoutAction

Revision: [4639]
Adding conditions parsing test to disprove Ticket #2256

Revision: [4638]
Adding 1.2 regression test for escaping fields for Ticket #1372

Revision: [4637]
Fixing MySQL schema generation for null columns

Revision: [4636]
Updating DboSource with new query generator, and updating model/dbo test cases

Revision: [4635]
adding fix for cleanUpFields

Revision: [4634]
adding fix for cleanUpFields

Revision: [4633]
Applying patch of ticket #2263

Revision: [4632]
Updating model test case

Revision: [4631]
Updating model test case

Revision: [4630]
Adding changes needed to allow passing $tagName param using dot notation so use Model.field instead of Model/field which is being deprecated

Revision: [4629]
Fixing order of operations in Model::invalidFields() (Ticket #2229)

Revision: [4628]
Adding Model::create() fix for Ticket #2200 and updating test case

Revision: [4627]
Setting checks for mock object declaration in FormHelper test

Revision: [4626]
Fixing AjaxHelper::dropRemote() (Ticket #2260) and updating test cases

Revision: [4625]
Updating core test cases and groups

Revision: [4624]
updating themeView for 2225, fixing layout paths noticed when using email component

Revision: [4623]
updating cleanUpFields to skip created, modified, updated and only update if the field is set

Revision: [4622]
Adding env('HTTP_BASE') to get base domain

Revision: [4621]
Shortening notation in Session test, removing debug data from HtmlHelper test

Revision: [4620]
Adding phishy's Oracle patch, fixing Sybase queries and column defs

Revision: [4619]
Fixing $_this reference in ConnectionManager (Ticket #2254)

Revision: [4618]
Fixing small bug in Session::check() (ticket #2257)

Revision: [4617]
Fixing FormHelper::create() for use with associated models

Revision: [4616]
updating cleanUpFields to skip created, modified, updated

Revision: [4615]
Appending .js to strings like script-x.x.x in link() function

Revision: [4614]
Added in code to parse the submitted command for tokens

Revision: [4613]
Making sure $attributes is an array in FormHelper::select()

Revision: [4612]
AuthComponent::isAuthorized() now returns true if valid authorization requirement is disabled

Revision: [4611]
Updating AjaxHelper::autoComplete() for new API

Revision: [4610]
Adding View::uuid() to generate DOM IDs, updating HTTP headers in View::error(), and fixing code formatting

Revision: [4609]
fixing bug introduced in cleanUpFields where it would add the current date to any datetime field

Revision: [4608]
Adding test.php to cake/scripts/templates/skel/webroot/

Revision: [4607]
adding fix for router urls without the *

Revision: [4606]
Disabling tests for new DboSource so they pass on old DboSource

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4696 3807eeeb-6ff5-0310-8944-8be069107fe0

cake/VERSION.txt

@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.4605alpha
+1.2.0.4696alpha

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