mark_story
45cabd40fe
Update version number to 2.4.6
2014-03-01 21:22:04 -05:00
ndm2
70a1b87db6
Fix wrong test model association class name
2014-03-01 23:01:33 +01:00
ndm2
01e1b5ca61
Fix failing tests caused by already existing classes
2014-03-01 20:24:32 +01:00
ndm2
008ad3237c
Fix verification of expected invocations #2919
2014-03-01 19:06:17 +01:00
ADmad
a707709e1d
Added test for FormHelper::radio().
...
Tests generating radio input for field with model other than one used
in create(). Refs #2911 .
2014-02-28 02:34:16 +05:30
mark_story
706ddfccae
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-02-26 21:09:06 -05:00
mark_story
822e2b80ae
Merge branch 'issue-2897' into 2.5
...
Merge pull request #2899 into 2.5 to fix issues with event dispatching.
2014-02-26 21:08:35 -05:00
mark_story
25f94f9b71
Add test to prove the fix made in pull/2899
...
Ensure that event listeners are not lost when merging the global and
local listeners.
Fixes #2897
Fixes #2899
2014-02-26 21:06:32 -05:00
ADmad
a0c399e374
Remove whitespace.
2014-02-26 10:40:53 +05:30
Saleh Souzanchi
9d4f3e92ab
fix issues #2897
2014-02-26 08:02:21 +03:30
mark_story
0f584c0e8b
Merge branch 'master' into 2.5
2014-02-24 21:19:17 -05:00
mark_story
0776b87214
Fix postLink() & postButton() with nested data.
...
Flatten deeply nested array data before generating hidden inputs.
This solves 'Array to string conversion' errors.
Closes #2894
2014-02-24 21:17:31 -05:00
Mark Story
e0e8f91d9e
Merge pull request #2866 from paddythenerd/master
...
Unsetting url both with & w/o this->base to allow proper handling when app n...
2014-02-24 20:27:25 -05:00
Mark Story
97ebfd6341
Merge pull request #2856 from cvandeplas/master
...
fixes issue #2855 where cafile is not set in HttpSocket
2014-02-21 22:29:35 -05:00
Patrick Barabe
08ba104543
Merge remote-tracking branch 'upstream/master'
2014-02-20 08:52:36 -07:00
Mark Story
2289521e30
Merge pull request #2873 from sam-at-github/requesthandlercomponent-reuse-a-var
...
One liner. Dont call function parseAccept() twice in RequestHandlerCompo...
2014-02-20 10:03:46 -05:00
Sam
62cb733988
One liner. Dont call function parseAccept() twice in RequestHandlerComponent.
2014-02-21 00:54:10 +11:00
mark_story
a80cbc205a
Simplify conditionals.
...
Set default values to remove else cases.
2014-02-19 21:46:53 -05:00
Mark Story
a254d2dd6d
Merge pull request #2869 from jalbertocr/master
...
FormHelper - Check DateTime instances to avoid fatal errors
2014-02-19 20:42:49 -05:00
jalbertocr
8b2e1ab9e5
Don't do assignments inside conditionals.
2014-02-19 22:41:33 -03:00
jalbertocr
cdeb51167b
Fix types in docblocks.
2014-02-19 20:54:00 -03:00
jalbertocr
35f152b333
Make sure a datetime instance is valid to avoid fatal errors.
2014-02-19 20:50:30 -03:00
Patrick Barabe
a69aeb67c1
A better fix for issue #2711 . Allows url to be unset from request array regardless of this->base context
2014-02-19 13:37:01 -07:00
Patrick Barabe
a9d7792678
Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot
2014-02-19 11:02:25 -07:00
Mark Story
4497bab131
Merge pull request #2864 from AD7six/2.4-better-float-validation
...
account for localized floats more robustly.
2014-02-19 12:08:30 -05:00
AD7six
4e0627232c
account for localized floats more robustly.
...
Normalize floats, strings too, so that they are validated as
dddddddddd.dd
ref #2853
2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4
Merge branch 'master' into 2.5
2014-02-18 22:19:12 -05:00
mark_story
0a51458ffd
Fix Validation::decimal() not working with localized floats.
...
Use similar workarounds as DboSource::value() for accepting localized
floats.
Fixes #2853
2014-02-18 22:18:56 -05:00
Mark Story
3d00ca9643
Merge pull request #2861 from ujwaltrivedi/master
...
Get unlimited number of slabs when clearing cache keys in memcache.
2014-02-18 20:46:50 -05:00
Ujwal Trivedi
1045a5e0a5
Update MemcacheEngine.php
...
removed 0 from getExtendedStats('slabs') in my last commit, someone point that out in the comment. Adding it back.
2014-02-18 18:40:17 -05:00
Christophe Vandeplas
f018e4ff4d
fixes issue #2855 where cafile is not set in HttpSocket
2014-02-18 09:39:56 +01:00
Mark Story
4353507ebb
Merge pull request #2852 from ujwaltrivedi/master
...
Update MemcacheEngine.php
2014-02-17 16:44:13 -05:00
Ujwal Trivedi
cb0580a91a
Update MemcacheEngine.php
...
removing variable assignment
2014-02-17 15:29:49 -05:00
mark_story
24fd23bbdd
Merge branch 'form-secure' into 2.5
...
Merge pull request #2582 into 2.5.
Fixes #2582
2014-02-17 11:03:59 -05:00
mark_story
3433f4a1f0
Clean up changes code standards and tests.
...
Refs #2582
2014-02-17 11:03:49 -05:00
Jonas
b32deed4aa
changed FormHelper::secure() and FormHelper::end() to support attributes in the hidden CSRF-protection tags that are being generated for SecurityComponent to allow specification of additional html attributes like HTML5s "form" attribute. This allows separation of Form instantiation/controls and form data - for instance within html tables
...
improved tests for testing against additional attributes for Form::secure()
improved tests for testing against additional attributes for Form::end()
removed array cast, fixed test
fixed docblock format
format
Fixed a bug, this won't work as some forms are just empty
2014-02-17 10:54:02 -05:00
mark_story
a965903777
Merge branch 'master' into 2.5
2014-02-17 10:51:32 -05:00
mark_story
070b165527
Mark compatibility shims as deprecated.
...
Fixes #2845
2014-02-17 10:29:03 -05:00
Mark Story
c325a93998
Merge pull request #2741 from ADmad/2.5-mimetype
...
Added regex support to Validation::mimeType().
2014-02-17 10:10:48 -05:00
Ujwal Trivedi
91ef655854
Update MemcacheEngine.php
...
adding $limit=0 to clear function so it deletes all the keys for real
2014-02-17 02:51:00 -05:00
ADmad
9ae7f11a2a
Made mimetype check case insensitive.
2014-02-17 11:48:00 +05:30
ADmad
2d87a9922e
Merge pull request #2841 from cakephp/2.5-debugger-log
...
2.5 debugger log
2014-02-17 11:29:52 +05:30
mark_story
cde93ca7b9
2.x needs to be compatible with PHP<5.4
2014-02-16 21:37:28 -05:00
mark_story
3919f93149
Use simpler assertions.
2014-02-16 14:37:29 -05:00
mark_story
7a4cabe5d3
Add depth to log().
...
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.
Refs #2834
2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
José Lorenzo Rodríguez
4f424007fa
Merge pull request #2822 from dereuromark/master-validation
...
Fix uploadError validation rule
2014-02-13 19:58:40 +01:00
Andy Dawson
198f8b6df5
Merge pull request #2589 from AD7six/handle-percent-translations
...
Handle percent symbol in translation functions
2014-02-13 16:48:43 +01:00
AD7six
5334fe04c3
handle loose % signs in __() function
...
While it's passed to sprintf and translation markers may contain
variable placeholders (%s, %d) that doesn't mean translators need to be
aware of all relevant rules. A % sign in a translation message shouldn't
cause a warning (and no return) it should be handled as a literal
percent sign.
2014-02-13 15:30:16 +00:00
ADmad
54a395cc3e
Updated docblock.
...
BlowfishAuthenticate is deprecated.
2014-02-13 17:54:53 +05:30