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
euromark
1725386c16
Fix uploadError validation rule to work with OS Win. Here the error is string, not integer.
2014-02-12 21:52:18 +01:00
mark_story
827dc77a11
Fix incorrect assertion.
2014-02-11 22:00:24 -05:00
mark_story
96a37d5917
Fix temporary associations that replace fields not being restored.
...
When binding temporary associations, fields should be restored
in the afterFind as the association will have become unbound.
Fixes #2816
2014-02-11 21:56:05 -05:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
José Lorenzo Rodríguez
0e46b5c827
Merge pull request #2804 from ADmad/2.5-cakerequest
...
Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod().
2014-02-11 11:20:11 +01:00
ADmad
d838e7b56f
Updated upgrade shell to change CakeRequest::onlyAllow() usages.
2014-02-10 18:18:09 +05:30
ADmad
1da79080ac
Updated bake templates to use CakeRequest::allowMethod()
2014-02-10 17:56:57 +05:30
ADmad
bea30e62cb
Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod().
...
Existing name is unintuitive and it's not easily apparent what
the method does. Closes #2803
2014-02-10 17:38:55 +05:30
Mark Story
7a72431442
Merge pull request #2770 from ukk1337/master
...
Added missing 'Session'-Component in bake
2014-02-09 16:04:25 -05:00
mark_story
91349c306e
Remove trailing whitespace.
...
Refs #2799
2014-02-09 16:03:37 -05:00
Mark Story
6b3a062927
Merge pull request #2799 from sam-at-github/master
...
Fixed prefixed action prefix reverse routing match. One liner.
2014-02-09 16:02:44 -05:00
Sam
f3cd0fc808
Test added for previous fix in CakeRoute.php. Refs #2797 .
2014-02-10 02:20:00 +11:00
Sam
a9059d4a4f
Fix formatting - one space too much. Refs #2799 .
2014-02-10 02:02:41 +11:00
Sam
7fd13d406c
Fixed prefixed action prefix reverse routing match. One liner.
2014-02-10 01:38:32 +11:00
ADmad
ac1a5c58f5
Merge pull request #2792 from rockingeric/fixer
...
Fix ApiGen errors
2014-02-08 02:26:51 +05:30
Eric Martins
2793dca671
Fix ApiGen errors
2014-02-07 18:29:54 -02:00
Mark Story
96048f401a
Merge pull request #2786 from sam-at-github/master
...
Router::comment() documentation
2014-02-06 07:15:34 -05:00
Sam
9691e54248
Minor comments only. Added more explanation of $defaults parameter to Router::connect(). Trying to clarify how it relates to the routing destination and the template string tokens.
2014-02-06 20:34:02 +11:00
Sam
ae3c791b6c
Minor documentation corrections about Router::connect().
2014-02-06 18:41:37 +11:00