Commit graph

16054 commits

Author SHA1 Message Date
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Mark Story
4f0d9b30a9 Merge pull request #2317 from ravage84/replace-ogtsl
Replaced all remaining license references to the Open Group Test Suite L...
2013-11-13 10:16:10 -08:00
Marc Würth
ce47890e98 Replaced all remaining license references to the Open Group Test Suite License with the MIT License 2013-11-13 18:52:06 +01:00
Andy Dawson
d94c187adc Merge pull request #2305 from kimegede/docblock-construct-destruct-return-void
Docblock construct destruct remove @return
2013-11-13 01:44:35 -08:00
mark_story
a07608cbb9 Fix incorrect CSRF token fields when using postLink()
Creating a postLink after creating a GET form would result in the
incorrect fields being generated.

Fixes #2308
2013-11-11 21:56:55 -05:00
mark_story
1f5d1eee98 Remove duplicated reference for behaviors in ClassRegistry
The 2nd key in the registry was to support persistModel which has long
since been removed. With this registry key not being used it can be
removed with reasonable safety.

Fixes #2306
2013-11-11 12:30:00 -05:00
Kim Egede Jakobsen
18e0dc95dd Remove @return from docblock (for __construct && __destruct methods) 2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad Try to make same comments for constructors.
Conflicts:
	lib/Cake/I18n/L10n.php
2013-11-11 11:03:57 +01:00
Mark Story
9d18a5da78 Merge pull request #2300 from cusspvz/patch-1
Model.php PHPDoc Description: Change afterFilter with afterFind
2013-11-10 10:43:05 -08:00
José Moreira
b1e366c500 Model.php PHPDoc Description: Chang afterFilter with afterFind 2013-11-10 16:59:28 +00:00
mark_story
8d38861a2e Fix missing HTML encoding on URL's generated by Html->meta().
The input URL was not correctly handled as an asset URL and thus was
not correctly HTML or URL escaped. This created invalid HTML when
favicon URLs included query string arguments.

Refs #2233
2013-11-09 14:31:09 -05:00
mark_story
bf2f2e772e Split existing tests up, and add tests for Router based image URL's
Refs #2233
2013-11-09 12:00:56 -05:00
mark_story
ada0ec4c77 Fix formatting of decimal values when there is no fractionSymbol.
When a currency format does not include a fractionSymbol it should be
able to format fractional values.

Fixes #2253
2013-11-09 09:36:38 -05:00
mark_story
407c420176 Remove CRLF from To headers in MailTransport.
Like other header fields To should not contain CRLF.

Refs #2209
2013-11-08 13:25:51 -05:00
Mark Story
d7977c6812 Merge pull request #2282 from bcrowe/hotfix-returnType
Add missing return type
2013-11-07 20:01:07 -08:00
Bryan Crowe
9ee5efaa2d Add missing return type 2013-11-07 22:14:11 -05:00
mark_story
145dbacb78 Fix incorrectly encoded headers in MailTransport.
When encoded values are present in header fields, they need to have
newlines removed as leaving the newlines in place and interfere with
delivery on Qmail based SMTP servers.

Fixes #2209
2013-11-04 22:17:21 -05:00
mark_story
d8acf531cb Merge branch 'postgres-sequence'
Merge changes for pull request #2248
2013-10-31 19:53:51 -04:00
mark_story
9e4ac31dc3 Correctly identifier quote column names before adding them to queries.
Closes #2248
2013-10-31 19:53:42 -04:00
Mark
2d50837e85 Merge pull request #2252 from bcrowe/hotfix-retrieve
Correct spelling of retrieve
2013-10-30 20:15:47 -07:00
Bryan Crowe
94d7ac1dd6 Correct spelling of retrieve 2013-10-30 23:13:07 -04:00
Mark Story
5bd31621c1 Merge pull request #2250 from luissquall/fix-cookie-explode
Parse cookie values "{}" & "[]" as array
2013-10-30 17:27:12 -07:00
Luis Ramos
e33653a8d7 Add test case 2013-10-30 16:06:27 -06:00
Luis Ramos
db63ba2d8f Parse cookie values "{}" & "[]" as array 2013-10-30 15:26:50 -06:00
Zach Gambino
927a4933d1 Fix for #2247 | Use correct column when calculating next sequence value
See #2247 for more details.
2013-10-30 11:25:06 -07:00
Mark Story
9d87f6fcb5 Merge pull request #2239 from bcrowe/hotfix-strictTimeCompare
Update date comparisons to be strict in CakeTime
2013-10-29 20:14:19 -07:00
Bryan Crowe
507bb44301 Update date comparisons to be strict in CakeTime 2013-10-29 23:02:14 -04:00
mark_story
16be5722ba Fix COUNT(DISTINCT x) queries from getting corrupted in Sqlserver.
Add into the tower of hacks that is the SQL generation and stop breaking
COUNT(DISTINCT foo) style queries. Previously these would be converted
into DISTINCT COUNT(foo) which will give the non-distinct results.
2013-10-29 23:01:55 -04:00
mark_story
0f8dae55c9 Add missing trim() around Sqlserver queries.
This solves issues with queries failing.

Fixes #2222
2013-10-29 23:01:49 -04:00
Mark Story
245c8eb8be Merge pull request #2236 from bcrowe/hotfix-timezoneParam
Make use of timezone parameter in CakeTime::dayAsSql()
2013-10-29 18:02:25 -07:00
Bryan Crowe
00c5e88570 Make use of timezone parameter in CakeTime::dayAsSql() 2013-10-29 20:29:01 -04:00
mark_story
525efcb808 Remove use of deprecated constants.
Fixes #2232
2013-10-29 17:49:16 -04:00
mark_story
a098ff28b8 Update doc block and remove inline assignment. 2013-10-29 12:32:20 -04:00
José Lorenzo Rodríguez
bd8f6e3d06 Merge pull request #2219 from zoghal/2.x-fix-download-multi-connection
2.x fix download multi connection/optimise serve file
2013-10-29 05:02:09 -07:00
mark_story
2d483f08ef Shift script install files around to put .bat first.
Hopefully this addresses installation issues on windows using composer.

Fixes #2145
2013-10-28 23:19:17 -04:00
mark_story
a753718387 Update docs for CookieComponent::delete().
Refs #2182
2013-10-28 23:13:51 -04:00
mark_story
07f4779efe Fix cookie component being inconsistent about writes.
Instead of treating multi-key and single key writes differently, they
should be treated consistently to allow simpler and more consistent interactions
with the stored data. This also results in fewer cookies being sent
across the wire which is an added benefit.

Fixes #2182
2013-10-28 23:13:51 -04:00
ADmad
eef2d919af Merge pull request #2225 from bcrowe/hotfix-cakephp
Change Cake to CakePHP
2013-10-28 20:05:15 -07:00
Bryan Crowe
8eb6652fd7 Change Cake to CakePHP 2013-10-28 22:14:50 -04:00
Saleh Souzanchi
8844e54647 Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection 2013-10-28 03:35:44 +03:30
Saleh Souzanchi
cc0c65d7ea update tests 2013-10-28 02:24:58 +03:30
Saleh Souzanchi
7c4a698bde update tests 2013-10-28 02:11:49 +03:30
Saleh Souzanchi
ab96ed56f3 fix multi connection/part downloading file 2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144 optimise download file 2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f fix spell of contentType 2013-10-28 00:49:40 +03:30
Mark Story
1f3b4838fb Merge pull request #2213 from zoghal/2.x-fixme
add mkv mime file type
2013-10-27 13:57:59 -07:00
Saleh Souzanchi
1f13f86367 add mkv mime file type 2013-10-28 00:14:38 +03:30
José Lorenzo Rodríguez
81e6a56543 Merge pull request #2201 from ravage84/start-viewblock-twice
Throw an exception when starting a view block twice
2013-10-27 03:22:35 -07:00
mark_story
411f510406 Fix file always being set to 'schema.php'
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.

Fixes #2202
2013-10-25 23:36:25 -04:00
Marc Würth
39cd7565ef Throw an exception when starting a view block twice 2013-10-26 03:35:12 +02:00