mark_story
3561929be7
Merge branch 'master' into 2.5
2013-11-10 21:53:09 -05: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
3c1f775ab2
Merge branch 'master' into 2.5
2013-11-09 09:37:27 -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
2e7d687b98
Merge branch 'master' into 2.5
2013-11-07 23:01:25 -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
ADmad
d647fe8a91
Added buffering of form tags generated by FormHelper::postLink()
2013-11-03 23:11:11 +05:30
mark_story
afd182898f
Merge branch 'master' into 2.5
2013-11-01 16:54:57 -04:00
davidsteinsland
94998763a5
Fixing whitespace
2013-10-31 23:58:52 +01:00
davidsteinsland
e68a61c375
Added configurable default value to Hash::get()
2013-10-31 23:31:48 +01:00
Rachman Chavik
fb436644c3
RedisEngine: Support for selecting database number
...
Closes GH-2254
2013-10-31 20:45:39 +07:00
Luis Ramos
e33653a8d7
Add test case
2013-10-30 16:06:27 -06:00
mark_story
aaac360833
Merge branch 'master' into 2.5
2013-10-30 14:58:20 -04:00
Mark Story
d6f5f2f0bb
Merge pull request #2244 from dereuromark/2.5-debugger
...
Pass depth through for Debugger::dump().
2013-10-30 11:26:28 -07:00
euromark
fecbef5949
Pass depth through for Debugger::dump().
2013-10-30 18:31:48 +01:00
mark_story
525efcb808
Remove use of deprecated constants.
...
Fixes #2232
2013-10-29 17:49:16 -04:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
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
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
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
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
Phally
9260a78ea3
Fixes last items for #1665 .
...
- Changes double quotes to single quotes.
- Documents and tests array-based string replace.
- Rewrites test case.
Rewrites the test case because the tests didn't work as well as
they should be. The test file copied itself to the tmp directory,
did some string replace stuff on it and then loaded the data to
test its contents. However in those contents were also the
expectations, so assertContains() would always see the string in
the file... even if the replacing didn't work.
Closes #1665 .
2013-10-26 14:50:42 +02:00
rooseveltrp
98e11cea5d
Adds File::replaceText().
...
Added File::replace()
Searches for a given text and replaces the text if found
Renamed File::replace() to File::replaceText()
Updated the replaceText() method to utilize File Locking
Updated File::replaceText()
1. Method now checks if the lock is not identical to null
2. Since the method uses File::read() to get the contents of the file,
there is no need for a temporary file. Removed the temporary file
creation
File::replaceText() update
Opening file with r+ mode
2013-10-26 14:05:12 +02:00
Marc Würth
39cd7565ef
Throw an exception when starting a view block twice
2013-10-26 03:35:12 +02:00
Mark Story
3dc60af166
Merge pull request #2204 from thatcode/master
...
Models fetched by Containable find depend on number of fields in intermediate Model
2013-10-25 17:33:32 -07:00
euromark
4048c686b7
coding standards
2013-10-25 19:29:33 +02:00
Robert Sworder
456645d7ad
Update tests for incorrect containable behaviour if a model only finds 1 field.
2013-10-25 15:15:52 +01:00
Marc Würth
86bc9d73cf
Emptied home.ctp in test_app as much as possible
...
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
2013-10-24 16:57:58 +02:00
Marc Würth
3773311cc0
Normalized associated models in unbindModel.
...
Resolves #1764
Had to cast $models to an array since ``Hash::normalize()`` doesn't support strings which ``Set::normalize()`` does (but which is deprecated).
Reused existing tests.
2013-10-24 15:28:31 +02:00
José Lorenzo Rodríguez
45bd01fdc0
Merge pull request #2132 from dereuromark/2.5-paginator-sort
...
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-24 05:40:42 -07:00
mark_story
23b23d8050
Fix delivery issues with long subject lines and MailTransport.
...
A few people have reported issues sending wrapped messages via
MailTransport. Removing the new lines has been suggested as a fix.
Refs #2176
2013-10-23 12:41:57 -04:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
Frank de Graaf
ab89f6ec97
Makes DboSource less string dependent.
2013-10-22 16:43:32 +02:00
euromark
fca8a01c15
Correct casing of class names.
2013-10-21 22:34:29 +02:00
euromark
def015108d
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-19 12:44:50 +02:00
Cameri
2b234236d6
Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest().
2013-10-18 11:41:38 -04:00
Cameri
069b309249
Added test case for JqueryEngineHelper::request() to validate 'xhr' callback.
2013-10-18 11:00:15 -04:00
mark_story
1ae470a284
Fix inflection rules for curves.
...
Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.
Fixes #2148
2013-10-17 12:15:56 -04:00
mark_story
935a51c892
Add tests for curve<->curves
...
Closes #2148
2013-10-17 12:10:49 -04:00
mark_story
5c8eb5c5a7
Add test cases for pluralization/singularlization of quota.
...
Closes #2077
2013-10-15 17:48:26 -04:00
Marc Würth
bf8a13a77c
Added binary type to field type map, defaulting to file input field
...
Refs https://github.com/cakephp/cakephp/issues/2071
2013-10-15 22:25:51 +02:00
mark_story
5a394c379a
Merge branch 'master' into 2.5
2013-10-14 22:57:50 -04:00
euromark
afb6471128
Make tests pass on win.
2013-10-14 23:59:14 +02:00
Mark Story
ce74153389
Merge pull request #1691 from uzyn/2.5-decimal
...
Add support for decimal type in Schema.
Fixes #3171
2013-10-14 08:36:15 -07:00
euromark
ed2054f4f2
Allow international domains to pass validation. Fixes #1763
2013-10-13 23:43:29 +02:00
euromark
1cb24ae537
CS fixes using phpcs-fixer auto-correction.
2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Jose Lorenzo Rodriguez
9673048c30
Merge branch 'master' of github.com:k-halaburda/cakephp into k-halaburda-master
2013-10-12 01:03:20 +02:00
Jose Lorenzo Rodriguez
63b65e2f69
Fixing CS
2013-10-12 00:58:14 +02:00
José Lorenzo Rodríguez
8cdbafd312
Merge pull request #1631 from ovidiupruteanu/patch-2
...
flushMethodCache not working if called before cacheMethod
2013-10-11 15:56:19 -07:00
Mark Story
3c6d0af01d
Merge pull request #1644 from WyriHaximus/2.5
...
Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.
2013-10-11 13:17:05 -07:00
mark_story
4265dbcc33
Use App.base when there are no requests to generate URL's
...
Setting App.fullBaseUrl to a non-host value causes issues generating
URL's in a web context. However, not including the base path generates
incorrect URL's in a CLI context. This change allows the use of App.base
to populate the base path which is used as a fallback when there are no
requests, or when the base path is empty.
Refs #2931
2013-10-10 23:07:03 -04:00
mark_story
5aa8a458b1
Update UUID pattern to accept the 'nil' UUID.
...
Fixes #4133
2013-10-10 21:11:55 -04:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
euromark
ce1939c4d6
Correct argument order.
2013-10-09 20:43:54 +02:00
Bryan Crowe
81c2e9db84
Capitalize UUID acronym
2013-10-08 21:46:30 -04:00
euromark
b5bd087bc5
Replace deprecated methods.
2013-10-08 20:23:57 +02: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
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
euromark
381a8c1216
Simplify test.
2013-10-08 00:47:47 +02:00
euromark
35ca40635e
Add doc block
2013-10-08 00:32:11 +02:00
euromark
c621985f69
Fix whitelist to be modifiable from behaviors to work with validate.
2013-10-07 23:45:27 +02:00
euromark
7b57df5554
Correct method names and missing parent calls.
2013-10-07 20:24:28 +02:00
mark_story
60b0893c79
Merge branch 'master' into 2.5
2013-10-06 23:49:32 -03:00
José Lorenzo Rodríguez
9472b3149b
Merge pull request #1704 from cakephp/2.5-cache
...
2.5 - Add Cache::remember()
2013-10-06 07:02:54 -07: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
0608ea2e7b
Merge pull request #1654 from kamisama/improvement/2.5-memcached-cache-engine-fix
...
Add option to select a serializer engine in Memcached Cache engine
2013-10-05 11:44:26 -07:00
mark_story
1ce89545bd
Fix 5.4 only syntax.
2013-10-05 14:40:23 -03:00
mark_story
f146d4334a
Add Cache::remember()
...
This method provides a really simple approach to read-through caching.
A callable or Closure can be used to provide results when the cache is
empty.
2013-10-05 10:47:07 -03: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
7df9925618
Merge pull request #1699 from dereuromark/2.5-page-title
...
2.5 page title
2013-10-04 05:18:22 -07:00
euromark
eb98770304
Remove leftover of pageTitle.
2013-10-04 00:35:56 +02:00
Renan Gonçalves
4f3b3737a5
Fixing CS errors.
2013-10-03 14:09:24 +02:00
Bryan Crowe
b9003e5f7c
Allow Folder::addPathElement() to accept arrays, also corrected docblock
2013-10-02 22:45:22 -04:00
wyrihaximus
ac9b7f3882
Refactored the shell reflection portion into a seperate task.
2013-10-02 22:30:12 +02:00
Cees-Jan
79202ad8a0
Updated doc blocks
2013-10-02 22:02:40 +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
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
ovidiupruteanu
dd3b1e41bc
Test case for DboSource::flushMethodCache
2013-10-01 21:34:40 +03:00
U-Zyn Chua
4806d09d7e
Setting of step for decimal field based on precision.
2013-09-29 22:44:50 +08:00
U-Zyn Chua
091658a752
Decimal support for FormHelper.
2013-09-29 22:40:35 +08:00
U-Zyn Chua
e527506c39
MySQL: Numeric data type now supported under decimal column. #3171
2013-09-28 23:05:53 +08:00
U-Zyn Chua
c74c8d49a1
Decimal support for SQLite. #3171
2013-09-28 14:36:55 +08:00
U-Zyn Chua
e0eb8f8e18
Added decimal CakeSchema test case and DatatypeFixture. #3171
2013-09-28 14:29:39 +08:00
U-Zyn Chua
a1a3e70039
Decimal support for PostgreSQL. #3171
2013-09-28 14:07:00 +08:00
mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04: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
U-Zyn Chua
7fb51ab50f
Decimal support for MySQL. #3171
2013-09-28 09:23:46 +08: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
ADmad
4dbf9107a8
Fixed infinite redirects for authenticated users accessing login page.
2013-09-27 22:33:07 +05:30