Val Bancer
9a69363858
Merge pull request #4 from cakephp/2.x
...
2.x sync
2017-11-21 15:17:07 +01:00
mark_story
10fcd7633d
Update version number to 2.10.5
2017-11-20 21:09:55 -05:00
mark_story
f788c90b3c
Fix typo
2017-11-05 22:34:47 -05:00
Mark Story
b175270f62
Merge pull request #11404 from ynaderi/2.x
...
- DigestAuthenticate modification for cakephp 2.X
2017-11-05 22:34:17 -05:00
Yaser Naderi
26a683f36f
- DigestAuthenticate modification for cakephp 2.X
2017-11-03 14:53:54 -04:00
Marc Würth
24e4acf9a3
Merge pull request #11397 from cakephp/2.x-allow-php72-failures
...
Allow the Travis builds on PHP 7.2 to fail
2017-11-02 01:40:40 +01:00
Marc Würth
5524768ea4
Allow the other PHP 7.2 job to fail
2017-11-02 01:18:00 +01:00
Marc Würth
c625269a60
Allow the Travis build on PHP 7.2 to fail
2017-11-02 01:11:58 +01:00
Marc Würth
0cb55916a8
Merge pull request #11347 from josephzidell/patch-1
...
Test against PHP 7.2
2017-11-01 16:42:53 +01:00
Mark Story
65373736a3
Merge pull request #11371 from Milanzor/2.x
...
Force email domain lookups to work in fallback case.
2017-10-25 18:34:33 -04:00
Milan van As
7de5ae4438
Force email domain lookups to work in fallback case.
2017-10-25 08:45:57 +02:00
Mark Story
509cd6f7c2
Merge pull request #11353 from saeideng/patch-1
...
2.x replace tab with space
2017-10-21 19:26:56 -04:00
saeideng
b59b64db29
replace tab with space
2017-10-21 22:44:15 +03:30
Joseph Zidell
46296db373
Test against PHP 7.2
...
Install `mcrypt` from PECL
2017-10-20 12:43:47 -04:00
mark_story
549c181926
Update version number to 2.10.4
2017-10-18 21:54:49 -04:00
Mark Story
79fd4eb4e7
Merge pull request #11332 from chinpei215/2.x-cookie-component-3
...
[2.x] Fix CookieComponent::delete() not working for deep children
2017-10-16 21:28:10 -04:00
chinpei215
19bbb7da17
Simplify CookieComponent::read()
...
Also, this commit fixes an issue of when the second level key is empty.
Previously, read('foo.0') returned incorrect result.
2017-10-16 21:01:19 +09:00
chinpei215
bbea91090d
Fix CookieComponent::delete() not working for deep children
2017-10-16 20:55:00 +09:00
mark_story
e85f489c1f
Add test for #11284
2017-10-13 21:55:56 -04:00
Mark Story
d3a4ce1216
Merge pull request #11284 from kolorafa/patch-1
...
msSQL - also handle offset as string
2017-10-13 21:55:21 -04:00
Mark Story
fb44035177
Merge pull request #11299 from tenkoma/2.x-fix-cc-number-jcb-pattern
...
[2.x]Fix Credit card number pattern(JCB) is wrong
2017-10-08 10:09:19 -04:00
Koji Tanaka
7d2d902b57
[2.x]Fix Credit card number pattern(JCB) is wrong
2017-10-08 16:15:10 +09:00
Mark Story
e889535e41
Merge pull request #11288 from mensler/session-without-cookies-2.x
...
Check for session.use_trans_sid and session ID in URL when cookies are disabled (2.x)
2017-10-07 12:17:30 -04:00
Clemens Weiß
61eddc6bde
Fixed formatting
2017-10-07 11:11:45 +02:00
Mark Story
a71cad0420
Merge pull request #11283 from chinpei215/2.x-cookie-component-1
...
[2.x] Fix fatal error thrown when replacing scalar with array
2017-10-06 16:45:38 -04:00
Mark Story
7e35169652
Merge pull request #11287 from chinpei215/2.x-hash-backport
...
[2.x] Backport Hash new features & bug fixes
2017-10-06 16:40:00 -04:00
Clemens Weiß
7f64ea37f9
Restored formatting
2017-10-06 17:11:09 +02:00
Clemens Weiß
5d5e791a31
Check for session.use_trans_sid and session ID in URL in case cookies are disabled (backport of cakephp/cakephp#10828 for 2.x)
2017-10-06 17:04:53 +02:00
chinpei215
deac8f9109
Backport #7080 , #8233 and #11060
2017-10-06 22:02:37 +09:00
chinpei215
ccf634e5f3
Docblock update
2017-10-06 21:59:48 +09:00
chinpei215
959f45a6c6
Fix fatal error thrown when replacing scalar with array
...
Refs #11280
2017-10-06 13:43:32 +09:00
kolorafa
22d2564de9
msSQL - also handle offset as string
...
When doing pagination you could get offset not as a int(eg. 10) but string(eg. "10") and it will not paginate at all.
For example DataTables plugin pass offset from params and all params from http request are strings wrapped in numbers.
Adding ctype_digit($offset) will also check the case.
2017-10-05 11:45:33 +02:00
Mark Story
b3d83afb81
Merge pull request #11263 from lustyrain/2.x
...
Fix: phpDocs miss
2017-10-04 16:34:34 -04:00
LustyRain
e1e5a292f2
Fix: revert return
2017-10-05 00:09:51 +09:00
LustyRain
0f00d73c70
Fix delete space, restored return
2017-10-04 21:02:48 +09:00
LustyRain
1f09318724
Fix delete space, restored return
2017-10-04 20:40:57 +09:00
LustyRain
8bb07c0fd7
Fix called twice
2017-10-04 11:39:31 +09:00
LustyRain
31b13edf8a
Fix: phpdoc miss
...
## did
- void unReturn
- miss return void
- add return type
- type miss typing
- add param type and return type
- string → string|array
- change ClassName
2017-10-04 00:22:42 +09:00
Mark Story
1b364176ff
Merge pull request #11259 from lustyrain/2.x
...
Fix: void unreturn
2017-10-02 18:56:23 -04:00
LustyRain
bececc421d
Fix: void unreturn
2017-10-02 15:40:48 +09:00
Mark Story
8d0590c5d1
Merge pull request #11222 from IonutBurlacu/Issue_11221
...
Bug in CakeEmail matching pattern
2017-09-22 22:55:06 -04:00
Ionut-Mihai Burlacu
31ed2d5dfb
Test Case
2017-09-22 11:45:38 +03:00
Ionut-Mihai Burlacu
5540569fcc
Test Case
2017-09-22 11:39:39 +03:00
Ionut-Mihai Burlacu
b5c3b93941
Merge branch 'Issue_11221' of https://github.com/IonutBurlacu/cakephp into Issue_11221
2017-09-21 14:33:24 +03:00
Ionut-Mihai Burlacu
3bc55f6341
Fixes #11221
2017-09-21 14:33:10 +03:00
Ionut-Mihai Burlacu
0bea90a5a2
Fixes
2017-09-21 14:30:51 +03:00
mark_story
c3a612aa94
Update version number to 2.10.3
2017-09-17 22:12:29 -04:00
Mark Story
14d338c276
Merge pull request #11194 from lustyrain/2.x
...
fixed basic.php miss PHPDocs
2017-09-15 15:37:39 -04:00
LustyRain
715dca8701
fixed basic.php
...
The return value is incorrect
2017-09-15 11:42:54 +09:00
Mark Story
73e3c3f90d
Merge pull request #11124 from jeremyharris/flash-stacking
...
Stacking messages in SessionComponent::setFlash
2017-08-31 14:03:18 -04:00
