Mark Story
01b6374a9d
Merge pull request #7175 from cakephp/2.7-hotfix
...
fix templates
2015-08-05 08:22:05 -04:00
Mark Scherer
3f15c8a199
fix templates
2015-08-05 11:45:27 +02:00
Mark Story
58bede76d1
Merge pull request #7103 from ravage84/2.7-fixture-import-record-aware
...
Make fixture import from table aware of records found
2015-08-03 16:01:35 -04:00
José Lorenzo Rodríguez
b89ac18e55
Merge pull request #7147 from cakephp/issue-7118
...
Fix incorrectly parsed mo file context.
2015-08-02 11:30:46 +02:00
Mark Story
b6cd2009e5
Merge pull request #7156 from ravage84/2.7-htaccess
...
Use tabs and single spaces in all .htaccess files
2015-07-31 20:37:26 -04:00
Marc Würth
27c88a872b
Use tabs and single spaces in all .htaccess files
2015-08-01 00:39:10 +02:00
mark_story
a73fc25657
Fix incorrectly parsed mo file context.
...
The context from mo files should be parsed correctly.
Refs #7118
2015-07-30 22:28:55 -04:00
José Lorenzo Rodríguez
eddb2beb46
Merge pull request #7141 from cakephp/issue-7135
...
Bootstrap Configure after the mb_* shims have been defined.
2015-07-30 10:20:24 +02:00
mark_story
26ab829d5a
Bootstrap Configure after the mb_* shims have been defined.
...
By bootstrapping after the shims have been defined allows the shims to
be used by Inflector which is often involved with bootstrapping.
Refs #7135
2015-07-29 22:01:27 -04:00
Mark Story
4d452812c0
Merge pull request #7131 from luissquall/fix-htaccess-indentation
...
Set .htaccess indentation to 4 spaces
2015-07-28 19:40:36 -04:00
Luis Ramos
a3bb420a7b
Set .htaccess indentation to 4 spaces
2015-07-28 17:58:38 -05:00
ADmad
003a0dde74
Merge pull request #7129 from ravage84/patch-3
...
Add "Reporting a Security Issue"
2015-07-28 23:35:47 +05:30
Marc Würth
00d0a50dc2
Add "Reporting a Security Issue"
...
Backport of #7104
2015-07-28 20:02:06 +02:00
José Lorenzo Rodríguez
355eb1859c
Merge pull request #7106 from cakephp/issue-7098
...
Consistently remove plugin names in object collections.
2015-07-28 15:58:41 +02:00
José Lorenzo Rodríguez
d5cc45c0cb
Merge pull request #7124 from cakephp/issue-7121
...
Don't stop reading when only a '0' has been read.
2015-07-28 14:52:05 +02:00
mark_story
58ea40e32c
Don't stop reading when only a '0' has been read.
...
Make tests simpler by using onConsecutiveCalls() instead of trying to
maintain mock method indexes.
Refs #7121
2015-07-27 22:40:27 -04:00
Mark Story
97be4f893a
Merge pull request #7117 from Tijme/2.7
...
Disable SNI in HttpSocket
2015-07-27 16:57:53 -04:00
Mark Story
6e16f78d69
Merge pull request #7114 from cakephp/2.7-nano-opt
...
use constant PHP_SAPI
2015-07-27 16:31:16 -04:00
t.gommers
b16d627b36
Disable SNI in HttpSocket
2015-07-27 13:03:21 +02:00
Mark Scherer
a239324a0d
use constant PHP_SAPI
2015-07-26 15:35:03 +02:00
mark_story
7f6ab82c9b
Merge branch '2.7' into 2.8
2015-07-25 21:49:03 -04:00
Mark Story
de4b44a37b
Merge pull request #7077 from dereuromark/2.7-static
...
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-23 22:27:37 -04:00
mark_story
b3a192add0
Add warning for irregular method.
...
Refs #7096
2015-07-23 21:49:22 -04:00
mark_story
418dcfd7f8
Consistently remove plugin names in object collections.
...
We were sometimes removing plugin prefixes (set, and some subclass
methods). But many other methods were missing the pluginSplit() feature.
This change makes all of the methods in ObjectCollection strip plugin
prefixes, which increases consistency across the framework.
Refs #7098
2015-07-23 21:46:21 -04:00
mark_story
45877df3eb
Update version number to 2.7.1
2015-07-23 21:08:54 -04:00
Mark Story
92ac2bc39d
Merge pull request #7101 from ravage84/2.7-bake-templates
...
Slightly improve the bake templates
2015-07-23 17:13:09 -04:00
Marc Würth
b412b405f9
Make fixture import from table aware of records found
2015-07-23 18:03:42 +02:00
Marc Würth
71e4ed91af
Slightly improve the bake templates
2015-07-23 17:29:47 +02:00
Mark Story
6c53f8bf93
Merge pull request #7097 from antograssiot/conEmu
...
enable colors for windows ConEmu user
2015-07-23 07:04:14 -04:00
antograssiot
94b2ea29a6
enable colors for windows ConEmu user
...
backport of #7090
2015-07-23 05:49:15 +02:00
Mark Story
e19f621314
Merge pull request #7086 from cakephp/issue-7069
...
Fix issues saveMany & saveAssociated with boolean values.
2015-07-22 22:01:39 -04:00
Yoshiyuki Kinjo
00919c5f01
Fix FormHelper::input ignoring value option.
...
Signed-off-by: mark_story <mark@mark-story.com>
Backport fixes from #7082 to 2.7
2015-07-22 22:00:20 -04:00
Yoshiyuki Kinjo
e25be3a47e
Add failing test for FormHelper::input
...
FormHelper::input does not respect 'value' option when form is of date/time type.
Signed-off-by: mark_story <mark@mark-story.com>
Backport fixes from #7082 to 2.7
2015-07-22 21:59:44 -04:00
Mark Story
6e209518ba
Merge pull request #7082 from yskkin/fix_formhelper
...
(2.x) FormHelper ignores value option
2015-07-22 21:58:55 -04:00
mark_story
c6e5026767
Fix issues saveMany & saveAssociated with boolean values.
...
For non-atomic, save operations that include models with boolean fields.
The first false value would cause the save to abort. This regression was
introduced in #6947 . Instead of checking the data from save() we should
be boolean casting save() to capture the success/failure.
Refs #7069
2015-07-22 00:41:10 -04:00
mark_story
e4b2428735
Fix PHPCS errors.
2015-07-21 16:28:17 -04:00
Yoshiyuki Kinjo
5de9b022ea
Fix FormHelper::input ignoring value option.
2015-07-21 23:04:20 +09:00
Yoshiyuki Kinjo
0e0775559c
Add failing test for FormHelper::input
...
FormHelper::input does not respect 'value' option when form is of date/time type.
2015-07-21 22:58:50 +09:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
mark_story
27e40f084d
Merge branch 'hash-maxdim' into 2.7
...
Merges pull requests #7041 and #7040 into 2.7
2015-07-20 22:26:55 -04:00
mark_story
bd23fdeebf
Simplify code and reduce test redundancy.
...
We don't need the additional parameter, and some of the tests weren't
covering unique scenarios.
Refs #7040
2015-07-20 22:16:50 -04:00
Chris Valliere
64f0ca0028
Fix Hash::maxDimensions
...
The current Hash::maxDimensions function calls Hash::dimensions to try
to get the maximum depth of the passed in array. However, this ends up
only getting the depth of the first element of each 1st dimension
element in the array passed to maxDimensions. The function needs to be
called recursively in order to get the depth of ALL of the elements in
all of the dimensions of the passed in array.
I made the maxDimensions function more closely resemble the deprecated
Set::countDim function in order to restore the correct functionality.
2015-07-20 22:07:58 -04:00
Chris Valliere
7b2d7ad748
Test Case for Hash::maxDimensions
...
Added test case for Hash::maxDimensions using the example array in pull request #7040 .
2015-07-20 22:07:58 -04:00
Mark Story
23b3b1a3cd
Merge pull request #7052 from ravage84/2.7-cherry-pick-issue-7037
...
Backport #7037
2015-07-17 10:44:37 -04:00
David Yell
4af2e5489b
Update deprecated method in docblocks
...
So that the docblock doesn't point you to another deprecated method which then points you to the actual method.
2015-07-17 16:14:06 +02:00
mark_story
1a1363fd2a
Merge branch 'authfix' into 2.7
...
Refs #7034
2015-07-16 23:00:54 -04:00
mark_story
9b313f86e4
Add tests for #7034
...
These tests ensure that redirect() is never called which ensures the
Location header is never set. Ajax requests when no loginElement is
defined should get an empty response with a 403 status code.
2015-07-16 23:00:20 -04:00
adam1010
1922a18d07
Ajax requests not properly returning 403
...
When an AJAX request is made to a page that's not authorized, an infinite redirect loop to /status:403/exit:1 is triggered. This bug has existed at least since CakePHP v2.3.0. The main use case is when a user's session has expired and they try to use an authenticated feature as a logged-out user.
2015-07-16 22:47:13 -04:00
Mark S.
67393f2525
Merge pull request #7037 from davidyell/patch-1
...
Update deprecated method in docblocks
2015-07-16 12:42:51 +02:00
David Yell
cfabc9a719
Update deprecated method in docblocks
...
So that the docblock doesn't point you to another deprecated method which then points you to the actual method.
2015-07-16 11:37:41 +01:00