mark_story
ad5130cd31
Merge branch '2.next' into 2.x
2016-09-18 22:22:56 -04:00
mark_story
835c709dfd
Add code fencing on example.
2016-09-16 19:17:08 -04:00
Marc Würth
1b101f73a6
Minor DocBlock improvement
2016-09-16 13:02:55 +02:00
Val Bancer
427d928d10
minor code style improvements
2016-09-05 21:53:10 +02:00
Val Bancer
98cd278c02
improved performance of insertMulti() in Mysql
2016-09-05 21:28:07 +02:00
mark_story
61b3fbd605
Merge branch '2.x' into 2.next
2016-08-09 22:12:26 -04:00
Mark van Driel
4dc8e54131
Fixed typo
2016-07-27 20:27:15 +02:00
Mark van Driel
5caac5f340
Prevent unnecessary joins / complex conditions in delete
2016-07-27 16:31:57 +02:00
Andrej Griniuk
e7f3365d8b
fix on php < 5.5
2016-07-26 23:57:14 +03:00
Andrej Griniuk
147693618c
refs #9174 fix CakeSchema compare when changing field length to the default one
2016-07-26 23:39:09 +03:00
Mark van Driel
c01525f2cc
Make check more strict to respect existing queries
2016-07-26 11:25:27 +02:00
Mark van Driel
d6e45131ad
Prevent unnecessary joins / complex conditions in delete
2016-07-25 17:15:18 +02:00
Philippe Saint-Just
be7cecbb00
Removed whitespace
2016-07-10 14:02:55 +01:00
Philippe Saint-Just
7edcdb0799
Handle plugin association consistently
2016-07-09 16:08:16 +01:00
mark_story
432eb9c432
Merge branch '2.x' into 2.next
2016-06-27 21:47:47 -04:00
mark_story
92a50d05dc
Reset query timing metrics for begin/commit/insert multi calls.
...
Apply patch from @Mensler to reset the query metrics for transaction
operations, and for each iteration of an insertMulti call. This helps
provide more accurate query times.
Refs #9014
2016-06-22 22:20:00 -04:00
Markus Bauer
2227e01990
Fixing Sqlite's handling of datetime/timestamp columns with current_timestamp default set
2016-05-19 00:21:43 +02:00
mark_story
12c6fd4e22
Merge branch '2.x' into 2.next
2016-05-02 21:58:41 -04:00
chinpei215
1826b4cb08
Add DboSource::flushQueryCache()
2016-04-19 00:01:06 +09:00
mscherer
dda9e83ab6
Refactor Object to CakeObject for future PHP7 comp.
2016-04-08 14:33:26 +02:00
Thomas Smith
3e86de5bcd
Replaced nested loop in merging hasMany children with one pass each through children and parents
2016-03-16 09:37:15 -07:00
mark_story
fef3090717
Fix incorrectly inheriting permissions.
...
When child inherits from a deny parent the '*' permission should reflect
permissions on all nodes not just the leaf node. Previously once a node
with all permissions set to inherit was found, the check would pass.
Instead it should cascade to the parent nodes and look for explicit
allow/deny.
Refs #8450
2016-03-11 23:18:50 -05:00
mark_story
1709f54e38
Update documentation for Model::_readDataSource()
...
Update sample code to generate unique keys based on association
conditions as well. Because association conditions are not part of the
'query' they need to be handled separately.
Refs #8346
2016-02-26 12:39:29 -05:00
Mark Story
ff6cdd4b73
Merge pull request #8279 from cakephp/issue-8114
...
Fix inherited permissions when checking the '*' permission.
2016-02-22 14:48:58 -05:00
mark_story
ee2d222b85
Correct API docs for find().
...
Fixes #8308
2016-02-21 22:42:24 -05:00
mark_story
4389c79442
Update tests.
...
The old tests were relying on the fixed inherit bug. Instead check
a specific permission which will result in a deny.
Refs #8114
2016-02-18 21:24:52 -05:00
mark_story
7a5907057a
Ensure keys are strings before accessing them.
...
Some userland datasources (namely an oracle driver) manage to get arrays
into $stack.
Refs #8281
2016-02-18 21:03:57 -05:00
mark_story
b2509ea13d
Fix inherited permissions when checking the '*' permission.
...
When checking inherited permissions for '*' also copy inherited
permissions onto the inherited list. By copying the inherited values, we
get the union of explit allow and inherited permissions, which if all
things go well will match the permission key list.
Refs #8114
2016-02-16 22:30:19 -05:00
Mark Story
68082fad02
Merge pull request #8207 from CakeDC/feature/uuid
...
Add support for Postgres native uuid datatype
2016-02-16 21:53:08 -05:00
Seth Tanner
c05835d85d
refs #8027 combine if statements
2016-02-11 01:49:34 +00:00
Mark Scherer
f1bea77d74
Fix bool check and also some doc blocks.
2016-02-09 01:18:43 +01:00
mark_story
c0d897b45c
Merge branch '2.x' into 2.8
2016-02-06 20:55:08 -05:00
mark_story
0309c483fb
Don't make variables we never use.
2016-02-06 20:34:19 -05:00
Mark Story
41a12e9aa2
Merge pull request #8067 from cakephp/issue-7906
...
Make the session cacheLimiter a configuration option.
2016-02-06 20:30:48 -05:00
mark_story
d9992bcaca
Use safer methods to read session configuration.
...
Avoid potential undefined index warnings by using read() to safely fetch
data.
Refs #8101
2016-01-30 16:21:33 -05:00
mark_story
3b5a71df37
Merge branch '2.7' into 2.8
2016-01-28 21:51:59 -05:00
Mark Story
aa449b194d
Merge pull request #8125 from CakeDC/issue/7978
...
Add support for NOT IN in Model::find() conditions.
Refs #7978 fixing regex to take in account IN operator
2016-01-28 21:48:04 -05:00
Edgaras Janušauskas
6e54a7391c
Use more specific datatypes in PHPDoc
2016-01-28 23:10:51 +02:00
Edgaras Janušauskas
fde1d08b43
Fix PHPDoc @return by replacing $this to self
2016-01-28 23:10:42 +02:00
Yevgeny Tomenko
70c4e40532
Fix value check and formatting.
2016-01-28 23:36:07 +03:00
Pedro Fernandes Steimbruch
eaeb7cea9e
Refs #7978 fixing regex to take in account IN operator
2016-01-28 17:34:08 -02:00
Yevgeny Tomenko
06853a137a
Merge remote-tracking branch 'remotes/origin/2.8' into feature/uuid
2016-01-28 22:08:10 +03:00
Yevgeny Tomenko
296f698db3
Added test cases covering native uuid field usage for Postgres class
2016-01-28 21:13:33 +03:00
Larry E. Masters
7c37cf5b5f
Using _cookieName() instead session_name()
2016-01-19 16:29:56 -06:00
mark_story
57f620fc22
Make the session cacheLimiter a configuration option.
...
Instead of hardcoding to must-revalidate, developers can use a more
suitable option if they do not have to support IE8.
Refs #7096
2016-01-18 22:18:38 -05:00
Seth Tanner
47bf98cae4
refs # 7929 refactor uuid support to not break Backward Compatibility
2016-01-15 11:43:01 -08:00
Seth Tanner
66f3a7e487
refs issue #7929 add support for Postgres native uuid datatype
2016-01-14 09:37:06 -08:00
Larry E. Masters
0aa8847762
Merge pull request #7840 from cakephp/2.8-PHP7
...
2.8 PHP7 compatibility
2015-12-29 00:27:33 -05:00
Larry E. Masters
e7a313edee
getting sloppy as I get older, fixing code sniffer errors
2015-12-29 00:06:44 -05:00
Larry E. Masters
6ee621011b
Using function_exists instead of using constant
2015-12-28 23:50:35 -05:00
