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
Mark Story
278349aff9
Merge pull request #2782 from jimmymadon/feature-clarify-acl-errors
...
Clarified ACL node lookup failed error.
2014-02-05 17:55:11 -05:00
Mark Story
8cddd354d9
Merge pull request #2785 from ADmad/2.4-view-return-value
...
Don't return `true` from view classes' render() method.
2014-02-05 17:37:15 -05:00
ADmad
d9489257d3
Don't return true
from view classes' render() method.
...
It cause's Controller:render() to set the response body as `true`.
Refs #2780
2014-02-06 03:06:00 +05:30
Jimmy Madon
fcd41e45a7
Clarified ACL node lookup failed error.
...
Original error was ambiguous in stating whether the ARO node lookup failed or the ACO node lookup failed.
2014-02-05 18:25:14 +00:00
David Steinsland
f2b9aa5ca4
Fixed HTTP Status code when ajaxLogin is set
2014-02-05 16:05:02 +01:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
mark_story
919cb7d90e
Fix bake templates to generate functioning code.
...
Closes #2776
2014-02-05 09:21:49 -05:00
ukk1337
3cd6bb39bd
fixed coding standard errors
2014-02-04 15:37:23 +01:00
ukk1337
60c289fd68
removed indentation
2014-02-04 13:47:50 +01:00
ukk1337
9670a5af88
Added missing 'Session'-Compomnent in bake
...
If a Controller was baked interactively and one want to use Session flash messages, the required 'Session'-Component wasn't added to the $components-Array
2014-02-04 13:35:48 +01:00
José Lorenzo Rodríguez
2cd72126fe
Merge pull request #2766 from AD7six/2.4.x-bc-form-fix
...
BC fix for checkbox ids
2014-02-03 23:55:52 -08:00
AD7six
adc0bf3ded
BC fix for checkbox ids
...
Revert to previous behavior for id generation of checkboxes, This commit
can be reverted for 2.5+ is desired
Fixes #2733
2014-02-03 17:57:26 +00:00
mark_story
ecf5aec1ae
Add '@' to the list of characters removed from radio/checkbox ID.
...
This character can easily show up in email addresses and can cause
invalid HTML.
Refs #2733
2014-02-02 21:20:31 -05:00
José Lorenzo Rodríguez
e36c954da7
Merge pull request #2693 from ADmad/2.5-session-start
...
Don't start a session if it's known to be empty.
2014-02-01 04:08:48 -08:00
Mark Story
a6459a6c2f
Merge pull request #2740 from rchavik/2.5-event-manager-regression
...
RFC Fix: CakeEventManager regression
2014-01-31 07:10:46 -08:00
Mark Story
405f3a1cb9
Merge pull request #2752 from rchavik/2.4-postgres-alterschema
...
Fix: Changing boolean to integer for Postgres
2014-01-31 06:46:52 -08:00
Rachman Chavik
9f978e9bf7
Check event against listeners registered in local and global manager
...
Closes #2730
2014-01-31 16:52:29 +07:00
Rachman Chavik
35c22a291e
Add test to prove Event Manager regression
2014-01-31 16:52:26 +07:00
Rachman Chavik
59549b7ebe
Fix: Changing boolean to integer for Postgres
...
Closes #2751 , CakeDC/migrations#149
2014-01-31 15:14:20 +07:00
mark_story
4d57d3ce5b
Fix plugin path filtering when directories do not exist.
...
When paths do not exist we should correctly remove them from the output
paths.
Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
605351d0c9
Allow empty values in checkboxes.
...
Allow the checkbox value attribute to be empty. This is required to make
checkboxes with a value of 0.
Fixes #2717
2014-01-30 21:12:06 -05:00
Mark Story
0906dec3c4
Merge pull request #2744 from wnasich/fix_html5_attribute_step
...
Rendering a proper value for html5 attribute 'step'
2014-01-30 15:04:17 -08:00