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
Jeremy Harris
0558c253f6
Replaced short array syntax with longer form
2017-08-31 09:02:08 -05:00
Jeremy Harris
f9f06e68b1
Stacking messages in SessionComponent::setFlash
2017-08-30 10:06:56 -05:00
mark_story
81d824077a
Update version number to 2.10.2
2017-08-29 21:19:36 -04:00
Mark Story
45b14133d4
Merge pull request #11077 from jeremyharris/sessionhelper-regression
...
Fixed SessionHelper not handling stacked messages
2017-08-22 13:41:12 -04:00
Jeremy Harris
2e75f12a4f
Fixed SessionHelper not handling stacked messages
2017-08-22 10:06:37 -05:00
Mark Story
cdf00a9956
Merge pull request #11056 from MCF/sql_server_ignore_persistent_2.x
...
Sqlserver DboSource does not allow the persistent option to be true.
2017-08-16 15:15:01 -04:00
Mike Fellows
0b658697f2
Sqlserver DboSource does not allow the persistent option to be true.
...
This is backported from CakePHP 3. The SQL Server PHP PDO driver does not
support the PDO::ATTR_PERSISTENT attribute. So throw an exception if the
'persistent' option is set in the database config. Also removes that
option from the Sqlserver base config.
2017-08-16 11:23:42 -07:00
Mark Story
12a2909e71
Merge pull request #11000 from bancer/truncate-performance-2
...
Improved performance of CakeFixtureManager.
2017-08-11 21:48:01 -04:00
Mark Story
38ea2fc7cd
Merge pull request #11021 from cakephp/issue-11002
...
Fix hiddenField option not working for radio (2.x)
2017-08-09 19:02:46 -04:00
mark_story
be534eacef
Fix hiddenField option not working for radio.
...
The hiddenField option was not working as documented for radio buttons.
Instead of using the provided value, the hidden input's value was
hardcoded to ''
Refs #11002
2017-08-08 22:02:07 -04:00
Mark Story
dca1289eef
Merge pull request #11017 from peloncano/2.x
...
PHPUnit_Util_Diff class not found fix
2017-08-08 21:34:32 -04:00
Luis Cano
1e5ea2451a
Fixes "Whitespace found at end of line"
2017-08-08 14:42:57 -04:00
Luis Cano
3307665cbb
Fixed syntax to work with PHP5.3
2017-08-08 14:28:11 -04:00
Luis Cano
9f175f22f4
Abiding to code standards
2017-08-08 12:59:33 -04:00
Luis Cano
90f14bc07b
fixes cakephp/cakephp#11016
2017-08-08 12:28:57 -04:00
mark_story
95e0a21439
Update version number to 2.10.1
2017-08-07 21:21:35 -04:00
Val Bancer
d91059460b
Improved performance of CakeFixtureManager.
2017-08-05 22:15:10 +02:00
Mark Story
895f6cac2a
Merge pull request #10994 from watermark/cakeemail_mimetype
...
Address CakeEmail regression when data is defined with no mimetype
2017-08-04 10:09:32 -04:00
bclay
8f92a87558
remove extra whitespace
2017-08-04 09:22:16 -04:00
bclay
38161917eb
Address CakeEmail regression when data is defined with no mimetype
2017-08-03 17:00:58 -04:00
mark_story
7c2ad08da5
Clean up formatting.
...
Refs #10912
2017-08-03 13:17:05 -04:00
Mark Story
b47e445c33
Merge pull request #10912 from bancer/phpunit-5.7
...
adapter for the getMock() depricated in phpunit
2017-08-03 13:14:11 -04:00
Val Bancer
746bb4619e
Merge pull request #2 from cakephp/2.x
...
2.x to phpunit-5.7
2017-08-03 02:10:37 +02:00
Mark Story
47bc13a43e
Merge pull request #10938 from cakephp/revert-10739-unnecessary-joins-delete-all
...
Revert "Takes into account the current recursive value in deleteAll()."
2017-07-29 12:20:09 -04:00
