Mark Story
2259309580
Merge pull request #3484 from dereuromark/master-hotfix-bake
...
Hotfix for older baked templates regarding postLink()
2014-05-13 16:53:06 -04:00
euromark
8af76a3705
Hotfix for older baked templates regarding postLink()
2014-05-13 20:51:39 +02:00
Mark Story
418c0a7b7c
Merge pull request #3481 from okinaka/master
...
Unset $db in DboSource::read().
2014-05-13 14:01:33 -04:00
mark_story
e9ecfe0936
Remove x bit on files.
...
PHP files should not have executable permission set.
2014-05-13 12:30:14 -04:00
Mark Story
33ebfa65cc
Merge pull request #3483 from dereuromark/master-hotfix-bake
...
Fixes baked postLink()s
2014-05-13 12:16:42 -04:00
Schlaefer
3ac731273e
adds backwards compatible 'between' alias for 'lengthBetween' validation rule
2014-05-13 17:36:23 +02:00
euromark
aefc459907
Fixes baked postLink()s
2014-05-13 17:14:11 +02:00
Mark Story
590e552d31
Merge pull request #3480 from Schlaefer/fix-testDecimalLocaleSet-OSX
...
fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X
2014-05-13 10:02:33 -04:00
Kenshin Okinaka
91cb3ddc27
Unset $db in DboSource::read().
...
After calling $db->queryAssociatin(), it is necessary to unset db.
This reverts commit 52d425737a
.
2014-05-13 21:17:34 +09:00
Schlaefer
e10e8fcb15
fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X
...
thousand separator isn't set in de_DE but in da_DK
2014-05-13 13:25:53 +02:00
Schlaefer
021d765620
fixes falling test case for 'lengthBetween' validator
2014-05-13 10:46:50 +02:00
Schlaefer
815838f150
replaces validator 'between' with 'lengthBetween'
2014-05-13 10:46:25 +02:00
Schlaefer
4848b63189
closes #3303 RFC: Rename Validator::between() into Validator::length()
2014-05-13 09:31:03 +02:00
Jose Lorenzo Rodriguez
3c57300816
CakePHP 2.5.0
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Darwin)
iQEcBAABAgAGBQJTcYCoAAoJEDwHD15Vs66g4PQH+wZkDgvrGK5AoMBU63tLhM68
txYUfV2g7YCjoWC/q0R5QbEYa7otBAAtREEdPisTU34pWPPGcar4/Q8M+bsztaJv
UfOWOzmVLqNqDGMfvJKL5Y3kWtuKDpUVGupa4SBdt/jQ0RxwsG5SBolwu7QQ15gr
BstQjA6RpTmdBjzbHVfX6WO3a//4utY3Nf0G4+aL5Q/y1FDNzyAmBq4OKahbBY0K
MnaWiANHXN/3YfFFaWxDk+P23gsiWckaqq3Q2ipaGGGQoWq0rMeWFw3OrSc4w4xS
L94poTkNDPqEzEjO7A4GvyvgXW4NhuuDbGkrSXciArfxihVSyB1mziDWSSYanAI=
=y8NE
-----END PGP SIGNATURE-----
CakePHP 2.5.0
2014-05-13 09:14:43 +02:00
mark_story
780132f892
Update version number to 2.5.0
2014-05-12 22:17:12 -04:00
mark_story
5b143fcfd7
Merge branch 'paginate-optimization' into 2.5
...
Fixes #3333
2014-05-12 22:11:27 -04:00
mark_story
a34d5f733d
Fix PaginatorComponent tests.
...
Because count() queries don't happen in many cases now, the lastQueries
index needs to shift up by one because a query isn't happening anymore.
Refs #3333
2014-05-12 22:10:27 -04:00
mark_story
b2207c1ca8
Reverse conditions to make the cheapest condition first.
...
We don't need to do a count() if the page is not 1.
Refs #3333
2014-05-12 22:09:27 -04:00
Toby Cox
823f01601d
enhancement to paginator
...
As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid
2014-05-12 21:49:08 -04:00
Toby Cox
296ea215b1
Enhancement to paginator
...
No point in finding the count (via model) if the returned result count
is less than our limit. We then know that the count is the count of our
results
2014-05-12 21:49:07 -04:00
mark_story
89cd114e6f
Merge branch 'master' into 2.5
2014-05-12 14:30:02 -04:00
mark_story
99cbaed298
PHP 5.6 builds should now pass.
2014-05-12 14:29:40 -04:00
mark_story
92e6c138c5
Add missing static on Debugger::output()
...
This method should have been static the whole time, and the lack of
static was causing tests to fail on PHP 5.6
2014-05-12 14:29:10 -04:00
Mark Story
5e369a5a86
Merge pull request #3468 from h4cc/patch-1
...
Added PHP 5.6 to travis.
2014-05-12 09:00:14 -04:00
Coen Coppens
91fbbdf6ca
Added $type as an argument.
...
See https://github.com/cakephp/cakephp/issues/2122
2014-05-12 12:08:06 +02:00
Julius Beckmann
c8a2921b12
Made PHP 5.6 a allowed failure on travis.
2014-05-12 08:42:17 +02:00
Dominik
cd445f2526
Add unix socket support to Redis cache engine
...
Refs #3438
2014-05-11 21:49:32 -04:00
mark_story
d0b995ad79
Merge branch '2.5' into 2.6
2014-05-11 21:47:42 -04:00
ADmad
63ab865174
Add formatting rules for .yml files to editorconfig.
2014-05-11 21:47:10 -04:00
Mark Story
6f08b064a6
Merge pull request #3470 from cuppett/master
...
Fixes #3469 , explicit isset check for counterCache
2014-05-11 21:13:55 -04:00
Stephen Cuppett
ed83df5bed
Fixes #3469 , explicit isset check for counterCache
2014-05-11 19:17:18 -04:00
Julius Beckmann
28404ace96
Added PHP 5.6 to travis.
2014-05-11 22:15:35 +02:00
mark_story
cc49d28ef8
Fix double / in missing component error page.
...
Fixes #3466
2014-05-10 22:02:22 -04:00
mark_story
cd37810b02
Merge branch 'fix-formhelper'
...
Fix failing tests on PHP5.2.x
2014-05-09 17:17:23 -04:00
mark_story
51909ae738
Only parse URLs when they contain ://
...
Parsing incomplete URLs fails in PHP5.2.
2014-05-09 17:01:24 -04:00
euromark
8f0e203fb5
test failed. reverted and corrected doc block instead for BC.
2014-05-08 01:52:48 +02:00
euromark
1caf1cac4b
Remove wrong return.
2014-05-08 01:46:08 +02:00
José Lorenzo Rodríguez
751d2d8f2d
Merge pull request #3448 from dereuromark/master-controller
...
Controller::referer() and local URL
2014-05-07 22:42:28 +02:00
mark_story
5469840c80
Fix incorrectly generated URL path.
...
Refs #3442
2014-05-07 08:52:42 -04:00
mark_story
1103ca7816
Ensure that only the path and query are used to make the hash.
...
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.
Fixes #3442
2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7
Make test names match the rest of the tests.
2014-05-06 22:13:44 -04:00
Mark Story
0e37f1bf27
Merge pull request #3445 from renan/2.5-authenticate
...
2.5 Allowing same Authenticate object to be setup with different settings
2014-05-06 17:03:01 -04:00
Renan Gonçalves
87683b10f1
Allowing same Authenticate object to be setup with different settings.
2014-05-06 22:10:41 +02:00
José Lorenzo Rodríguez
23519e1988
Merge pull request #3441 from dakota/patch-1
...
Fixes issue with Sql Server driver when loading fixtures
2014-05-06 13:13:37 +02:00
Walther Lalk
2dd3cecfaa
Fixes issue with Sql Server driver when loading fixtures
...
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.
This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
2014-05-06 12:43:36 +02:00
mark_story
4f0845d243
Merge branch '2.5' into 2.6
2014-05-04 22:14:45 -04:00
mark_story
9e06b54ff8
Merge branch 'master' into 2.5
2014-05-04 22:14:33 -04:00
ADmad
ead6c837c8
Add formatting rules for .yml files to editorconfig.
2014-05-04 18:37:41 +05:30
ADmad
aa7f18840c
Merge branch '2.5' into 2.6
2014-05-04 14:40:39 +05:30
ADmad
d466e00644
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
lib/Cake/Utility/Folder.php
lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30