Commit graph

15911 commits

Author SHA1 Message Date
mark_story
59f441e6bc Make equality checks more strict. 2013-10-08 16:29:24 -04:00
mark_story
f82b00c25e Fix content view variable being stomped by send() parameter.
The content of send() should only be used if it is a non-empty value.

Fixes #4129
2013-10-08 12:28:45 -04:00
ADmad
105f032e81 Merge pull request #1705 from Schlaefer/FileLog-RotateOlderLogs
fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate'
2013-10-07 20:58:07 -07:00
Mark Story
2cc9be75e3 Merge pull request #1709 from bcrowe/hotfix-url
Changed url to URL where appropriate
2013-10-07 20:39:47 -07:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
euromark
7b57df5554 Correct method names and missing parent calls. 2013-10-07 20:24:28 +02:00
Schlaefer
8060f1b4be fixes FileLog doesn't delete on rotation if rotate = 0 2013-10-06 15:04:57 +02:00
Schlaefer
83d340a3af fixes FileLog doesn't delete on rotation if count(files) is greater 'rotate' 2013-10-06 13:59:52 +02:00
euromark
cd3defcc0b Correct spelling mistake in class name. 2013-10-06 02:12:57 +02:00
Mark Story
49ddf6a5cf Merge pull request #1687 from Schlaefer/model-cache-improvements
performance improvements in Model::_clearCache
2013-10-05 07:50:07 -07:00
Mark Story
ef645b5619 Merge pull request #1703 from ADmad/2.4-file-input-required
Fixed setting "required" attribute for file input. 

Fixes #4124
2013-10-04 09:58:03 -07:00
ADmad
aa60b8791a Fixed setting "required" attribute for file input. Closes #4124
In general fixed the issue where enabling SECURE_SKIP for a field
skipped "required" attribute check altogether. Instead now "required"
is set to false for hidden fields by default.
2013-10-04 20:35:38 +05:30
Mark Story
ba1eb7e495 Merge pull request #1700 from bcrowe/hotfix-filedocblocks
Updated returns in docblocks in File utility
2013-10-04 05:27:44 -07:00
Mark Story
b7966c918a Merge pull request #1701 from bcrowe/hotfix-phpcs
Fixed CS error
2013-10-04 05:21:41 -07:00
Bryan Crowe
8895405577 Rrue to True, simple typo 2013-10-04 02:06:32 -04:00
Bryan Crowe
c729b56b23 Additional grammatical corrections to File utility 2013-10-04 02:03:53 -04:00
Bryan Crowe
4dfd37909f Fixed CS error 2013-10-03 22:05:46 -04:00
Bryan Crowe
79c3336b7e Updated returns in docblocks in File utility 2013-10-03 20:40:00 -04:00
Renan Gonçalves
4f3b3737a5 Fixing CS errors. 2013-10-03 14:09:24 +02:00
mark_story
530731ec5d More gracefully handle invalid data in Accept headers.
Some browsers have invalid accept headers, we should ignore the invalid
extension data as assuming it will be a qualifier can result in
incorrect results.

Fixes #4105
2013-10-02 11:29:04 -04:00
Mark Story
942bb77046 Merge pull request #1695 from renan/2.4-wordwrap
Make String::wrap() unicode aware. Fixes #3981.
2013-10-02 05:04:02 -07:00
Renan Gonçalves
a73e926467 Make String::wrap() unicode aware. Solves #3981. 2013-10-01 22:35:11 +02:00
mark_story
314ae1c8b4 Merge branch 'master' of github.com:cakephp/cakephp 2013-10-01 15:12:34 -04:00
mark_story
b1ea2d3a2b Merge pull request 1661 from 'sime/fallback-content-type' to master. 2013-10-01 15:11:57 -04:00
Simon Males
c998888fe7 Do not assume CONTENT_TYPE is available.
In some server environments notably the CLI server, _SERVER['CONTENT_TYPE'] is not available.
In these cases, fall back to the HTTP_CONTENT_TYPE header.

Refs #GH-1661
2013-10-01 15:10:33 -04:00
Mark Story
727d02df14 Merge pull request #1694 from dereuromark/master-home-ctp
Only show the rewrite rule error message if the default CSS is in place.

Fixes #4116
2013-09-30 11:51:28 -07:00
euromark
1c6a379346 Fix issue 4116 and also merge both versions of home.ctp 2013-09-30 20:45:26 +02:00
José Lorenzo Rodríguez
06a89f128a Changing order of jpeg aliases so that mapType() returns the most common one 2013-09-28 14:24:13 +02:00
Schlaefer
be61a5023f Refactors Model::_clearCache
- don't use mixed keys in $assoc array
- removes unnecessary strtolower on Inflector::underscore result
- return early
2013-09-28 10:16:23 +02:00
mark_story
e96fe515a1 Rename config class used in test cases.
Having a separate classname for testing allows the testsuite to not
provide a classname that the application would. This allows composer to
generate the correct classmap when CakePHP is installed with composer.

Fixes #4112
2013-09-27 22:22:23 -04:00
Mark Story
cd9b325bef Merge pull request #1690 from bcrowe/master
Updated additional references of Cake to CakePHP
2013-09-27 18:59:34 -07:00
Bryan Crowe
bb65765d70 Updated additional references of Cake to CakePHP 2013-09-27 21:31:35 -04:00
Frank de Graaf
3e8af8b180 Merge pull request #1689 from dereuromark/master-cakephp-name
Cake to CakePHP name
2013-09-27 12:16:25 -07:00
Frank de Graaf
ceb78fee9c Merge pull request #1671 from ADmad/bugfix/auth-infinite-redirect
Fixed infinite redirects when authenticated user tried to access login p...
2013-09-27 12:13:36 -07:00
euromark
9a86f7e883 correct spelling mistake 2013-09-27 20:28:03 +02:00
euromark
df269ba0ef Cake to CakePHP name 2013-09-27 19:36:43 +02:00
ADmad
4dbf9107a8 Fixed infinite redirects for authenticated users accessing login page. 2013-09-27 22:33:07 +05:30
Schlaefer
99ec97bd19 performance improvements in Model::_clearCache
- don't empty cache twice if pluralized name is identical to underscored
- refactors for fewer function calls
2013-09-27 16:39:23 +02:00
Mark Story
355e2efbc6 Merge pull request #1685 from dereuromark/master-autolink
Test to prove that autoLink has issues with umlauts.
2013-09-27 06:53:38 -07:00
Mark Story
066e0b6677 Merge pull request #1684 from dereuromark/master-shell
Bugfix: Assert own tasks are loaded before trying to access taskNames.
2013-09-27 06:52:12 -07:00
euromark
bd87ef45f2 complete autoLinkEmail() 2013-09-27 15:01:46 +02:00
euromark
205f7a504b also fix autoLinkEmail() 2013-09-27 14:56:53 +02:00
Frank de Graaf
41a7739b69 Merge pull request #1686 from andydhobbs/ticket-4108
Fixes bad merge of #1683.

Refs #4108.
2013-09-27 05:53:10 -07:00
euromark
2a954b6095 Make TextHelper::autoLink() work properly with umlauts. 2013-09-27 14:48:57 +02:00
Andy Hobbs
56f1c9b8b5 Ticket 4108
- updated DboSourceTest::testFieldsCacheKeyWithSchemanameChange() to skip for Postgres and Sqlserver
2013-09-27 13:03:32 +01:00
Renan Gonçalves
bd1c0b18ff Merge pull request #1679 from dereuromark/master-cleanup-tests
Don't use comp. wrappers anymore.
2013-09-27 04:10:39 -07:00
euromark
c23531e806 Assert own tasks are loaded before trying to access taskNames. 2013-09-27 12:53:18 +02:00
Mark Story
ad1b80645d Merge pull request #1683 from andydhobbs/ticket-4108
Fix fields cache to depend on the schemaName as well.

Fixes #4108
2013-09-26 07:04:55 -07:00
Andy Hobbs
0f7d6a90a1 Ticket 4108
- Added schemaName to DboSource::fields() method cache key to fix bug with changing schema name
2013-09-26 11:56:14 +01:00
Renan Gonçalves
ad0944c491 Merge pull request #1681 from bcrowe/hotfix-camelcasejs
Updated JavaScript in doc blocks and helper references
2013-09-26 01:52:18 -07:00