Commit graph

18156 commits

Author SHA1 Message Date
mark_story
8a91878033 We can't depend on PHPUnit anymore as it doesn't exist in pear form 2015-01-15 21:59:23 -05:00
mark_story
09e5e43d09 Update version number to 2.6.1 2015-01-15 21:36:35 -05:00
Mark Story
2a9f2d4b58 Merge pull request #5668 from cakephp/issue-5649
Fix numeric values not being quoted for MySQL set columns.
2015-01-15 21:29:57 -05:00
Mark Story
8969565526 Merge pull request #5675 from cakephp/master-docs
Correct CakeSocket docblocks.
2015-01-15 21:27:30 -05:00
mark_story
396d501d1e Fix / being handled incorrect by referer()
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'

Fixes #4812
2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0 Fix numeric values not being quoted for MySQL set columns.
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.

Refs #5649
2015-01-15 21:10:33 -05:00
Mark Scherer
2b1e487530 Correct CakeSocket docblocks. 2015-01-15 23:39:09 +01:00
David Steinsland
a5e1be7abf Fixed tests 2015-01-15 23:11:36 +01:00
David Steinsland
e5134986e6 Reset Exception.bail just in case 2015-01-15 20:10:48 +01:00
David Steinsland
ed3b15f13b Fixed phpcs 2015-01-15 20:04:06 +01:00
David Steinsland
f621bb7fe5 Fixed nesting when ExceptionRenderer throws exception 2015-01-15 19:20:28 +01:00
Mark Story
ac5ba9942b Merge pull request #5670 from davidsteinsland/fix_session_destroy
CakeSession::destroy() should check for existence of session
2015-01-15 08:13:39 -05:00
David Steinsland
687d0b44f5 Backport of https://github.com/cakephp/cakephp/issues/5667 2015-01-15 11:00:27 +01:00
mark_story
d39c744c28 Fix PHPCS error. 2015-01-12 21:37:34 -05:00
mark_story
7b20884d43 Fix failing tests. 2015-01-12 21:36:28 -05:00
Mark S.
77e8661cb7 Merge pull request #5651 from bcrowe/copyright
Bump copyright year in license
2015-01-12 21:47:04 +01:00
Bryan Crowe
6a83e6b1de Bump copyright year in license 2015-01-12 15:18:04 -05:00
mark_story
ac9a212d44 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
mark_story
cd58fa0b61 Backport changes from #5635 to 2.x
In case the path passed to the File class doesn't exists, this will
cause File::$path to be set to a partial path, that is the filename
of the passed path with a slash prepended, ex with

    $file = new File('/non/existent/file');

calling $file->pwd() will return/set /file, possibly causing that
file in the root to be accessed.
2015-01-11 15:20:34 -05:00
José Lorenzo Rodríguez
0a4141c78c Merge pull request #5614 from cakephp/issue-5595
Convert header_sent exception into a notice error.
2015-01-09 22:25:09 +01:00
Mark Story
1fee3c030e Merge pull request #5616 from cakephp/issue-5603
Fix radio buttons not being added to security hash.
2015-01-09 15:32:44 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
18f02bf5b3 Don't emit errors or trigger exceptions when headers have been sent.
After discussing it a bit, we've come to consensus that emitting errors
or throwing exceptions are both pretty disruptive and annoying to deal
with. Instead we'll revert to the previous 2.x behavior of doing
nothing.
2015-01-09 15:16:14 -05:00
ADmad
e3b48cdf6f Merge pull request #5617 from antograssiot/master
Replace our custom code fence with markdown standard fence.
2015-01-09 22:53:43 +05:30
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
mark_story
98909fb465 Fix radio buttons not being added to security hash.
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.

Refs #5603
2015-01-08 23:25:34 -05:00
mark_story
a7aaa93131 Convert header_sent exception into a notice error.
Throwing an exception here, causes an infinite loop when handling fatal
errors, as the shutdown function sends headers automatically.

Refs #5595
2015-01-08 21:47:13 -05:00
José Lorenzo Rodríguez
642e11e728 Merge pull request #5610 from dmromanov/patch-2
Fix double encoding time strings (CakeTime)
2015-01-08 22:46:27 +01:00
dmromanov
eb414bdda1 Fix double encoding time strings (CakeTime)
Fix time strings being double encoded when mb_string is not installed.
2015-01-09 00:03:49 +03:00
Mark Story
2ee5c3d73d Merge pull request #5590 from bcrowe/criteria
Correct criterion inflection
2015-01-06 23:11:00 -05:00
Bryan Crowe
66a0e6226d Correct criterion inflection 2015-01-06 23:03:53 -05:00
Mark Story
c4f9727720 Merge pull request #5576 from istvanp/2.7
Prevent NULL value on NOT NULL column when value is an empty string
2015-01-06 21:23:53 -05:00
Mark Story
d21b046fc8 Merge pull request #5582 from cakephp/master-hotfix-string-wrap
Stop goofy formatting when newlines are present already.
2015-01-06 12:04:54 -05:00
euromark
389f745d16 Stop goofy formatting when newlines are present already. 2015-01-06 13:13:33 +01:00
José Lorenzo Rodríguez
bc09c9a3aa Merge pull request #5559 from cakephp/2.7-caketext
Rename String class to CakeText. Backport from 3.0
2015-01-05 22:34:43 +01:00
Istvan Pusztai
22b0275a58 Prevent NULL value on NOT NULL column when value is an empty string (MySQL) 2015-01-05 12:04:24 -05:00
José Lorenzo Rodríguez
f6975f5254 Merge pull request #5572 from cakephp/issue-5570
Improve error used when a cache configuation fails to start.
2015-01-05 10:15:35 +01:00
mark_story
d7bc73b1e3 Improve error used when a cache configuation fails to start.
Refs #5570
2015-01-04 19:54:58 -05:00
euromark
52ecccb1a2 App::uses and usage replacements for String => CakeText. 2015-01-05 01:00:57 +01:00
euromark
63093e1d30 More String CakeText replacements and a BC class. 2015-01-05 00:55:23 +01:00
euromark
274b78e44c Rename test case. 2015-01-05 00:54:36 +01:00
euromark
722e54279c Rename String to CakeText. 2015-01-05 00:53:32 +01:00
Mark S.
b76fbd8da1 Merge pull request #5557 from cakephp/2.7-configure-backport
Backport of 3.0 Configure corrections.
2015-01-04 23:57:56 +01:00
Mark Story
848e9133f8 Merge pull request #5558 from cakephp/2.7-session-backport
Backport of 3.0 Session API hardening and clear().
2015-01-04 17:49:08 -05:00
Mark Story
49b9d2c865 Merge pull request #5566 from hakito/patch-1
Avoid connection to default for mocked models

Fixes #5565
2015-01-04 17:48:02 -05:00
Gerd Katzenbeisser
bf3ff8e2ad Avoid connection to default for mocked models
Fixes #5565
2015-01-04 16:53:00 +01:00
euromark
394da88d23 Stay 100% BC for 2.7 2015-01-04 10:52:18 +01:00
euromark
dabf55785f Simplify test assert. 2015-01-04 02:30:11 +01:00
euromark
a947958dc9 Fix cs 2015-01-04 02:27:40 +01:00
euromark
d848c5f327 cs 2015-01-04 02:22:37 +01:00