Commit graph

15083 commits

Author SHA1 Message Date
Diego Massanti
255fe004eb Patched CakeResponse's MapType() to increase performance by reducing hundreds of is_array() and is_string() system calls 2013-05-01 09:50:29 -03:00
Rachman Chavik
5682907a88 Add Cache::groupConfigs() to get group->config map 2013-05-01 12:03:15 +07:00
mark_story
62186ac8da Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-28 17:00:30 -04:00
mark_story
e4b276c55f Update version number to 2.3.4 2013-04-28 16:30:59 -04:00
mark_story
65b1a94e63 Simplify how fullBase is calculated.
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.

Fixes #3777
2013-04-27 23:03:25 -04:00
mark_story
c327bdc4bd Enforce model aliases when generating order by clauses.
Invalid SQL could be created by sorting on an invalid alias, with
a field that exists on the model.

Fixes #3797
2013-04-27 13:29:29 -04:00
ADmad
e11d0f829a Added html5 required attribute for select tags too 2013-04-27 18:39:53 +05:30
ADmad
8135d405a3 Merge branch 'master' into 2.4 2013-04-27 18:39:30 +05:30
Mark
372cd6f952 Merge pull request #1250 from dereuromark/master-form-input-require
dont add required class on wrapper div
2013-04-26 07:07:17 -07:00
Mark Story
cfda4e5c43 Merge pull request #1248 from zoghal/fix-router1
fix currentRoute() when $_currentRoute is empty, return false
2013-04-26 07:00:33 -07:00
euromark
67cc7f66da dont add required class on wrapper div 2013-04-26 15:41:35 +02:00
Saleh Souzanchi
4aabf72e1f fix currentRoute() when $_currentRoute is empty, return false 2013-04-26 13:36:35 +04:30
Rachman Chavik
03e5207aa1 Fix: write() after clearGroup() does not actually write to file
Although clearGroup() does not use $this->_File, it needs to be null-ed
so that subsequent write() call do not see stale object.
2013-04-26 14:43:36 +07:00
ADmad
3c036e9ebf Merge pull request #1249 from DiegoMax/master
Fixed CakeResponse Tests
2013-04-26 00:37:18 -07:00
Diego Massanti
03b6c3fa61 Fixed test case for CakeResponse 2013-04-26 04:32:44 -03:00
Saleh Souzanchi
720dc5e8c0 fix currentRoute() when $_currentRoute is empty, return false 2013-04-26 09:09:40 +04:30
Mark Story
509b2b1e44 Merge pull request #1247 from DiegoMax/master
Added missing HTTP Status 505 to CakeResponse
2013-04-25 14:58:39 -07:00
Diego Massanti
a3d405524e Added HTTP Status 505 (Unsupported Version) to CakeResponse 2013-04-25 17:59:28 -03:00
mark_story
8b9dea5f52 Merge branch 'master' into 2.4 2013-04-24 21:59:10 -04:00
ADmad
ede33dbee4 Fix coding standard error 2013-04-25 03:19:40 +05:30
ADmad
19f8274a95 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
Jose Lorenzo Rodriguez
c19e3d075e Update version number to 2.3.3 2013-04-24 23:19:51 +02:00
Jose Lorenzo Rodriguez
db6dd18f86 Fixing case where it was possible to pass array data to FormAuthenticate
fields
2013-04-24 22:33:24 +02:00
mark_story
e144afead7 Fix Vendor/bin/cake not working when installing CakePHP with composer. 2013-04-24 14:43:47 -04:00
Mark Story
2e75c00db5 Merge pull request #1245 from ravage84/patch-4
Fixed some typos in core.php
2013-04-23 12:23:36 -07:00
Mark Story
ac269ffd9b Merge pull request #1244 from ravage84/patch-3
Fixed some typos in core.php
2013-04-23 12:23:24 -07:00
Marc Würth
993ec1fed6 Fixed some typos in core.php
In sync with this one https://github.com/cakephp/cakephp/pull/1244
2013-04-23 21:50:26 +03:00
Marc Würth
baadaec608 Fixed some typos in core.php 2013-04-23 21:48:23 +03:00
Ceeram
ef90850801 Removing extra whitespace, phpcs fix 2013-04-23 12:54:48 +02:00
euromark
dbc2a7a9e4 correct spelling mistake 2013-04-23 12:34:59 +02:00
ADmad
3db632732c Avoid unnecessary overhead if user record already available from session. 2013-04-23 01:35:04 +05:30
Mark Story
292438e4e7 Merge pull request #1243 from sime/translateCRInitCall
Second parameter of ClassRegistry::init() is a boolean, not a string
2013-04-22 09:51:23 -07:00
euromark
48fa358260 Remove leftover param that is now wrongly triggering "strict" 2013-04-22 11:36:17 +02:00
Simon Males
77feac9ef6 Second parameter of ClassRegistry::init() is a boolean, not a string 2013-04-22 14:06:30 +08:00
ADmad
4b1283f002 Merge pull request #1242 from sime/noTypeInClassRegistryInit-master
No use of type key in ClassRegistry::init()
2013-04-21 22:59:33 -07:00
Simon Males
880c70cc8c No use of type key in ClassRegistry::init() 2013-04-22 13:55:28 +08:00
mark_story
62660c6706 Re-assign $db after beforeSave.
This allows model/behavior methods to change the datasource in the
beforeSave callback. If you use drivers from different SQL platforms
things will go very poorly.

Fixes #3606
2013-04-21 21:15:44 -04:00
mark_story
c2c096428c Uncomment test.
I missed this earlier, because I'm a doofus.
2013-04-21 11:29:25 -04:00
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
3dbc3a0abe Merge branch 'master-time'
See #GH-1237
2013-04-20 14:54:29 -04:00
mark_story
64da4e75c4 Remove silly code.
Changing the 12'th hour into 0 shouldn't be done when figuring out the
meridian, it makes sorting things out later more complicated. Remove
some duplicated code.
2013-04-20 14:48:54 -04:00
mark_story
f6c3015705 Add additional tests and fix incorrect meridian selection
When dates around midnight were used with interval + 12hr formats, the
incorrect meridian was selected.

Refs #GH-1237
2013-04-20 14:39:47 -04:00
Majna
78ea4da681 Add test for time input with interval on first hour of the day 2013-04-20 17:51:50 +02:00
Ceeram
842b1802d9 add assert that habtm save does not return false 2013-04-19 19:37:23 +02:00
mark_story
efd86a498a Do type checks when looking for models in Controller::$uses.
This solves issues with models not being added when $uses = true.

Fixes #3774
2013-04-19 12:20:46 -04:00
mark_story
63b392a26b Improve error message.
One of the cases was not explained in the existing error message.

Fixes #3773
2013-04-19 12:13:58 -04:00
Mark Story
58fbee54f4 Merge pull request #1234 from rchavik/2.4-template-copyrights
remove copyrights from bake templates
2013-04-19 08:57:46 -07:00
mark_story
0f3d28c6ea Fix condition parsing in mysql specific cases.
When using collation + array values the incorrect operator would be
used. IN should be used over =.

Fixes #3772
2013-04-18 21:52:22 -04:00
mark_story
3680ee0f1f Add some docs for cookies. 2013-04-18 21:23:40 -04:00
mark_story
4d8dd12449 Add support for key => value cookies.
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.

Fixes #3771
2013-04-18 21:22:50 -04:00