Ceeram
0b0d83f261
remove cookie reading in startup
2012-09-07 00:04:03 +02:00
AD7six
99b798fa9a
make it possible to override all of basics.php
2012-09-06 10:19:06 +02:00
Mark Story
93004fcf2f
Merge pull request #818 from shama/patch-unused-vars
...
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Mark Story
c8cb3ae75f
Merge pull request #810 from schrolli/patch-2
...
Update lib/Cake/Configure/IniReader.php
2012-09-05 17:45:43 -07:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 15:57:53 -07:00
Kyle Robinson Young
602240c08e
Fix $readReceipt variable in EmailComponent::send
2012-09-05 12:49:09 -07:00
mark_story
c7647b775f
Attempt to fix build error in travis.
2012-09-04 17:25:02 -04:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
ADmad
28951865c6
Hidden divs created by FormHelper can now be customized.
2012-09-04 23:56:30 +05:30
mark_story
5b641287e9
Make schema errors clearer.
...
When a schema fails because of the name, the error should display
the name & file name that it attempted to load. This gives people
a slightly better chance of figuring things out.
2012-09-03 21:06:48 -04:00
mark_story
0d826528e1
Supress fewer errors.
...
PHPUnit raises exceptions on errors, there isn't much point in
supressing all these errors.
2012-09-03 20:13:30 -04:00
mark_story
771cfde196
Fix coding standards.
2012-09-03 20:09:13 -04:00
mark_story
bacd8afde3
Remove duplicated header.
2012-09-03 19:55:29 -04:00
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check()
)
2012-09-04 01:04:48 +02:00
Mark Story
eb33929829
Merge pull request #731 from dereuromark/2.3-fix-rss-test
...
2.3 fix rss test
2012-09-03 15:03:44 -07:00
mark_story
3cb501f1c5
Fix issue created in [ e8b5d81fd7
]
...
Query conditions with `-` and no surrounding spaces were quoted
incorrectly.
Fixes #3178
2012-09-03 13:24:38 -04:00
mark_story
583bb37df0
Fix typo.
2012-09-03 13:10:27 -04:00
euromark
387a974396
avoid path being made absolute twice
2012-09-03 13:16:40 +02:00
brq
fca98e39f9
Allow postLink() to support other HTTP methods; it defaults to POST
2012-09-02 12:57:35 -05:00
schrolli
83c05c24b3
Update lib/Cake/Configure/IniReader.php
...
Updated docblock and set NULL as the default value of $path
2012-09-02 14:23:26 +03:00
schrolli
a4c382b23a
Update lib/Cake/Configure/IniReader.php
...
Copied standard path from PhpReader
2012-09-02 06:02:30 +03:00
mark_story
f155687cfa
Update version number to 2.2.2
2012-09-01 18:28:03 +01:00
mark_story
21a51a374a
Revert "Make test a bit more solid."
...
This reverts commit 072991d0da
.
2012-09-01 14:43:11 +01:00
mark_story
072991d0da
Make test a bit more solid.
2012-09-01 14:34:10 +01:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
474e42cc08
Switch File::info() tests to use a different file.
...
text/php files are not detected reliably across platforms. Use a plain
text file instead. This should fix builds on travis.ci
2012-09-01 12:40:05 +01:00
mark_story
d3105332dc
Fix coding standards errors.
2012-09-01 12:14:15 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -
.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
Maggion Emmanuel
03f6f041b2
Fix typo
2012-08-31 09:50:22 +03:00
mark_story
894fc1256a
Add test cases for strings containing quotes.
...
Show that both double and single quoted strings are
handled correctly by ExtractTask.
Closes #3155
2012-08-30 23:48:32 +01:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
mark_story
d92ff9cc10
Merge branch '2.3' of github.com:cakephp/cakephp into 2.3
2012-08-30 19:42:46 +01:00
mark_story
e64f5f15e2
Fix big int lengths on SQLserver
...
SQLserver big ints aren't as big as other database servers.
2012-08-30 19:18:25 +01:00
mark_story
d4ee62be61
Add support for biginteger on SQLserver.
2012-08-30 16:35:36 +01:00
mark_story
8d8f4b5c5d
Add bigint support for Sqlite.
...
* Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
2012-08-30 14:48:59 +01:00
mark_story
7bad865d6e
Add bigint support for postgres
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
ec35e3158c
added tests for bigints
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
68116f7017
BIGINTs can also be primary keys
2012-08-30 14:48:59 +01:00
Tommy MacWilliam
15555a7309
added schema support for mysql bigints
2012-08-30 14:48:59 +01:00
mark_story
6a95b5746a
Remove un-necessary parameter.
2012-08-30 14:48:13 +01:00
mark_story
19c2a58185
Fix strict errors.
2012-08-30 14:46:29 +01:00
Kyle Robinson Young
ee9a545c7d
Correct docblock see tags to ViewBlock
...
Fixes http://cakephp.lighthouseapp.com/projects/43067/tickets/97-about-api-description-of-viewassign
2012-08-29 21:53:29 -07:00
Juan Basso
fd2f3aed46
Changed to accept language do not return the qualifiers and order the values by the qualifier. Also, making the test case insensitive
2012-08-28 23:52:05 -04:00
mark_story
4fdd5e5d45
Ignore non-scalar values for length.
...
Fixes #3159
2012-08-28 21:58:32 -04:00
Mark Story
f97d8f9bb7
Merge pull request #800 from bar/master-validator-decimal
...
Refactor Validator::decimal() to be more flexible with decimal separators and PHP magic. Lots of testing added.
2012-08-28 13:41:40 -07:00
Ber Clausen
63548267e9
Refactor Validator::decimal() to be more flexible with decimal
...
separators and PHP magic.
Lots of testing added.
2012-08-27 23:25:17 -03:00
mark_story
b27c8a05bd
Make invalid short option error more helpful.
...
Refs #3157
2012-08-27 22:12:05 -04:00
mark_story
fba17cffe9
Move OptionParser initialization out of try block.
...
This allows exceptions that result from creating the optionparser to
display to the developer, making debugging easier.
Fixes #3157
2012-08-27 22:07:28 -04:00
Mark Story
7135ff29fb
Merge pull request #773 from bar/master-fix-inireader
...
Add plugin support to IniReader, and harden tests.
2012-08-27 12:36:57 -07:00
mark_story
988a847f49
Fix unescaped entities.
2012-08-27 14:48:07 -04:00
Ber Clausen
bdac857293
Add plugin support to IniReader, and harden tests.
...
The actual config file must always have .ini extension.
For backwards compatibility, acl.ini.php will be treated specially until 3.0.
2012-08-27 10:04:26 -03:00
Ceeram
f1ce3f9ae5
remove settings parameter from initialize as this is not being passed. only the constructor gets settings passed
2012-08-27 11:42:57 +02:00
mark_story
cbb64bd082
Fix blackhole requests with empty select boxes.
...
When a select box was entirely empty (no option element)
secured form submission should not fail.
Fixes #3153
2012-08-26 22:53:48 -04:00
mark_story
934838f77c
Fix whitespace.
2012-08-26 22:17:36 -04:00
mark_story
028795eb2e
Clarify docs.
2012-08-26 22:17:02 -04:00
mark_story
b68a2ed84d
Update API docs.
2012-08-26 22:15:18 -04:00
Ceeram
abe74adf8a
partial remove onlyAllow from baked code, only keep in delete to be rfc compliant
2012-08-26 15:00:49 +02:00
Mark Story
a553142a0a
Merge pull request #796 from MrRio/ticket-3152
...
Fix Email test fails when not running on port 80
Fixes #3152
2012-08-25 18:18:50 -07:00
James Hall
20baeb83db
Change to match coding standards
2012-08-26 02:11:43 +01:00
James Hall
a3b5065f8a
Make sure the environment variable is set
2012-08-26 00:33:32 +01:00
James Hall
6c4ba233ba
Fix testSendRenderWithImage when non running on port 80
2012-08-26 00:23:32 +01:00
mark_story
7966c00700
Merge branch 'master' of github.com:cakephp/cakephp
2012-08-25 17:53:22 -04:00
James Hall
7484007fa7
Fix #3148 MediaView does not support Microsoft Office default formats
2012-08-25 17:51:48 -04:00
Jose Lorenzo Rodriguez
f6278488af
Ensuring list of behavior methods are refreshed between calls of
...
validates() in the model, fixes #3071
2012-08-25 14:05:19 +02:00
Jose Lorenzo Rodriguez
60eb228ddf
Fixing issues with validation rules not being reset after calling
...
create() on the model or when calling validates() multiple times
This had interesting side effects when deep saving
2012-08-25 13:29:16 +02:00
Ceeram
27d83eedfe
use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included
2012-08-25 09:38:40 +02:00
Paul Redmond
a993a7a50d
Fixing typo in view property during unset()
2012-08-24 23:11:25 -07:00
mark_story
17ba713651
Simplify code.
2012-08-24 22:52:02 -04:00
Tigran Gabrielyan
0441c9f6c3
Added tests for bake shell cache prefix generation
2012-08-24 22:52:02 -04:00
Tigran Gabrielyan
8e818c89b6
Added $prefix
generation in core.php
for cake bake
shell
2012-08-24 22:52:02 -04:00
mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
mark_story
b2f62f46c5
Fix failing tests in postgres.
2012-08-24 22:37:23 -04:00
Ber Clausen
b75a6b440a
Treat float numbers with trailing zeroes removed by PHP, accordingly.
...
Revert #2800 (28bd6880df
) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-24 22:22:12 -04:00
Thom Seddon
f3ba2bdb7d
Remove legacy test for all actions allowed (*) in startup and tidy code
2012-08-24 19:30:25 +01:00
mark_story
24b68ec1db
Ensure = is removed from generated salt values.
2012-08-24 09:35:33 -04:00
Ceeram
f06ce1324d
Merge branch '2.2-habtmmerge'
2012-08-24 10:45:45 +02:00
mark_story
dcc5a95482
Only split on ; for TABLE related statements.
...
Fixes #3142
2012-08-23 23:11:00 -04:00
Ceeram
cb80338c7d
avoid duplication in return value when saving habtm
2012-08-24 00:50:46 +02:00
Mark Story
064fef1a15
Merge pull request #779 from dereuromark/2.3-ellipsis-html
...
use html ellipsis if possible
2012-08-23 13:20:38 -07:00
Mark Story
fe3d99cdfc
Merge pull request #775 from sitedyno/BlowfishAuthenticate
...
Add BlowfishAuthenticate adapter.
2012-08-23 13:16:34 -07:00
Heath Nail
d24bbcb255
Add BlowfishAuthenticate adapter.
2012-08-23 11:23:51 -04:00
Ceeram
c5ebbc991c
Revert "Merge pull request #784 from ceeram/habtmmerge"
...
This reverts commit fa5aa6278f
, reversing
changes made to 88604ac757
.
2012-08-23 16:00:41 +02:00
ceeram
973670ca1c
Merge pull request #749 from ceeram/2.3-allow
...
Add allowed() to CakeRequest, to check if the request method matches the...
2012-08-22 16:44:11 -07:00
Ceeram
d730acba59
Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones.
...
Throws exception if not matched, using the required Allow response header.
2012-08-22 17:23:24 +02:00
Ceeram
e7dc23b920
Ensure callbacks are triggered when using Xml/Json view with view templates.
...
PaginatorHelper for instance needs this to correctly set options
2012-08-22 13:13:49 +02:00
Ceeram
fb0053753e
avoid duplication in returned results for habtm
2012-08-22 13:03:47 +02:00
mark_story
88604ac757
Replace is_a with instanceof.
2012-08-21 08:47:58 -04:00
Renan Gonçalves
172e4bed5d
Fix STRICT warnings on PHP 5.4
2012-08-21 13:08:43 +02:00
mark_story
62dd39133b
Fix lint errors + comment content.
2012-08-20 16:21:59 -04:00
mark_story
d5333a2ff1
Merge branch 'master' into 2.3
2012-08-20 16:20:27 -04:00
mark_story
00f3e7e441
Fix silent failures.
...
Fixes #3133
2012-08-20 16:19:34 -04:00
mark_story
e75fdd21ee
Add tests to show caseinsensitive nature of detectors.
...
Closes #3132
2012-08-20 11:43:10 -04:00
Stephen Cuppett
7e5f326300
Fix STRICT warnings on PHP 5.4
2012-08-19 17:00:26 -04:00
euromark
07d92ef678
correcting test
2012-08-17 14:02:20 +02:00
euromark
7969062614
legacy support with test cases
2012-08-17 13:57:47 +02:00
euromark
40398429ff
coding standards
2012-08-17 13:37:04 +02:00
euromark
f201684873
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4
Merge pull request #752 from dereuromark/2.3-truncate-tail
...
String::tail()
2012-08-16 11:02:06 -07:00
Mark Story
08e4362d40
Merge pull request #772 from bar/master-fix-phpreader
...
The actual config file must always have .php extension.
2012-08-16 11:00:27 -07:00
mark_story
8146cc4db4
Update mime types of various powerpoint extensions.
...
Fixes #3121
2012-08-15 23:14:57 -04:00
mark_story
c83e941497
Merge branch 'master' into 2.3
2012-08-15 21:00:49 -04:00
mark_story
73f29069de
Fix issue where omitting a base class would break test generation.
...
Fixes #3115
2012-08-15 20:59:56 -04:00
mark_story
b0f2cfd1d1
Fix coding standards.
2012-08-15 20:19:08 -04:00
ADmad
7ac01154f7
Merge branch '2.2-configure'
2012-08-15 20:09:25 +05:30
ADmad
18c5a4aee5
Make file extension optional for Configure reader adapter's dump function.
2012-08-15 19:38:58 +05:30
mark_story
cdc70fc427
Make RequestHandlerComponent better simulate GET requests.
...
Modify the global state to simulate a GET request. This avoids issues
where PUT data would be processed during simulated redirect.
Fixes #3113
2012-08-14 12:46:47 -04:00
mark_story
e183e91b17
Make CakeRequest work with content-type headers that include a charset.
...
Refs #3113
2012-08-14 12:42:05 -04:00
ber clausen
0dec093f48
The actual config file must always have .php extension.
2012-08-13 23:50:58 -03:00
euromark
e1fbfcef00
fix contain for find method
2012-08-13 08:10:51 +02:00
ADmad
65e63c51c8
More missing parent calls.
2012-08-12 02:28:12 +05:30
ADmad
802f00b6e3
Adding missing calls to parent.
2012-08-12 02:13:10 +05:30
ADmad
4a483b4897
If cache is disabled in app and js cache file is not written don't return script tag with file url.
...
Instead return script block with inline js content.
2012-08-12 01:08:05 +05:30
mark_story
11227f5490
Fix coding standards.
2012-08-10 21:50:37 -04:00
mark_story
0bbf61ce3d
Add removed getDataSource() call.
...
This fixes an issue where the wrong datasource could potentially be used
for getting the full table name.
2012-08-10 21:48:22 -04:00
Mark Story
7dae12456a
Merge pull request #759 from dereuromark/2.3-cake-schema
...
2.3 cake schema
2012-08-10 18:11:50 -07:00
Ceeram
ab7dd99e43
add missing docblock, remove unneeded code
2012-08-10 11:05:19 +02:00
Ceeram
7ea1a59035
adding test for viewClass mapping
2012-08-10 10:33:37 +02:00
Ceeram
21431cba64
Add viewClass map method to RequestHandler component, to map content types to viewclass.
2012-08-10 09:54:22 +02:00
Ceeram
e2e42ee185
move serialization to separate method, for easier overriding in subclasses
2012-08-10 09:54:05 +02:00
mark_story
e5ad204265
Ignore standards for PHP defined constants.
2012-08-09 20:54:04 -04:00
mark_story
6f7557898d
Fix whitespace and comment errors.
2012-08-09 20:51:29 -04:00
mark_story
4487673060
Merge branch 'master' into 2.3
2012-08-09 20:43:47 -04:00
Mark Story
0322e808a7
Merge pull request #760 from zoghal/fix-2-3-full-url
...
Full url prefix is better defined before auto loading
2012-08-09 17:37:40 -07:00
ceeram
ebb0ceb6a0
Merge pull request #764 from ceeram/2.2-2998
...
2.2 2998
2012-08-09 09:21:42 -07:00
Ceeram
d4986b5f24
add responseHeader() method to new base exception class, ExceptionRenderer will pass the headers to the response.
...
Tests added.
2012-08-09 14:52:05 +02:00
José Lorenzo Rodríguez
596f2c0d91
Merge pull request #734 from steinkel/feature/smtp-tls
...
Adding TLS support to SmtpTransport
2012-08-08 23:36:13 -07:00
mark_story
b29cc6a9b6
Try again at fixing errors in 5.2
2012-08-08 23:09:44 -04:00
mark_story
c94a684be8
Try to fix recursion issues in PHP5.2.
2012-08-08 22:42:44 -04:00
mark_story
dca050fbd6
Fix errors with recursion in debug()
...
Fixes #3102
2012-08-08 22:30:27 -04:00
Saleh Souzanchi
36243b45f8
Full url prefix is better defined before auto loading
2012-08-09 06:42:24 +04:30
euromark
5190b9f2c9
asserting that under_scored names result in valid ClassNames
2012-08-08 16:35:59 +02:00
euromark
bed5453be0
correcting order
2012-08-08 14:44:38 +02:00
euromark
62dee78ca5
adding models for schema generate
2012-08-08 14:15:28 +02:00
euromark
5e0e850733
reduce 5-level if cases to 2 levels
2012-08-08 13:42:40 +02:00
Justin A. Barnes
476bd80644
Fix cake bake project always finding CakePHP libs in php include_path.
...
Cake shell was adding the CakePHP libs to php include_path resulting in
producing baked projects without hardcoded CAKE_CORE_INCLUDE_PATH when
hardcoded CAKE_CORE_INCLUDE_PATH is needed.
Refs #GH-755
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-07 20:52:37 -04:00
José Lorenzo Rodríguez
1ff63758ad
Merge pull request #750 from tigrang/security-component-enhancement
...
Added `disabledActions` feature to SecurityComponent
2012-08-06 12:05:17 -07:00
mark_story
57c495f53a
Enabled Debugger::exportVar() to display private & protected properties.
...
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
2012-08-06 13:32:52 -04:00
Nicholas de Jong
d4fa5d000c
Allow an App to define its own LOGS and CACHE paths outside TMP
2012-08-05 14:55:22 +10:00
ADmad
8931b74ba2
Removed variable escaping in CakeErrorController::beforeRender(). Closes #3074
2012-08-05 02:36:29 +05:30
mark_story
b32273e713
Fix whitespace errors.
2012-08-04 15:57:04 -04:00
euromark
2a570e639c
ellipsis instead of ending/beginning for core wide consistency
2012-08-04 19:58:23 +02:00
mark_story
dbe3234b56
Refactor help to show up on console -h as well.
2012-08-04 13:57:14 -04:00
mark_story
d7f1bf52b1
Fix route commands in ConsoleShell.
...
Apply patch from 'Ludovic Pouzenc' to fix route features in the console
shell.
Fixes #3096
2012-08-04 13:44:35 -04:00
mark_story
73b1c0ac1c
Fix off by one error.
...
Fixes #3094
2012-08-03 23:34:44 -04:00
mark_story
e59555a66f
Merge branch 'master' into 2.3
2012-08-03 22:45:56 -04:00
mark_story
788cf52572
Fix saving empty values for translated fields with multiple locales
2012-08-03 22:40:38 -04:00
Christopher Vrooman
bbd0b9dd8b
Tweaked DocBlocks
...
Set property and return to boolean for DocBlocks of the CallbackPostTestModel class.
2012-08-03 22:40:28 -04:00
Christopher Vrooman
de1450763b
Added a failing test to testSavePartialFields
...
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
2012-08-03 21:19:44 -04:00
Tigran Gabrielyan
617d470427
Renamed disabledActions to unlockedActions
2012-08-03 11:01:19 -07:00
euromark
853fa7d95b
doc block correction
2012-08-03 10:54:16 +02:00
mark_story
e620433680
Update doc block.
2012-08-02 21:35:06 -04:00
mark_story
e38c149880
Decompose complex nested conditionals.
...
Refs #808
2012-08-02 21:35:06 -04:00
euromark
a208eb6cb1
fixes disabled attribute for multiple checkboxes
2012-08-02 21:35:05 -04:00
Tigran Gabrielyan
df8ec17626
Added disabledActions
feature to SecurityComponent
2012-08-02 18:27:52 -07:00
mark_story
c96e364cbb
Fix incorrect expiry of sessions.
...
Fixes #3088
2012-08-02 21:03:53 -04:00
euromark
917d912a43
String::tail()
2012-08-02 13:21:31 +02:00
euromark
64ba8c6b6e
remove debug statement
2012-08-02 10:18:14 +02:00
mark_story
cffc36e4e0
Fix notice error when impossible conditions are created.
...
Fixes #3084
2012-08-01 23:05:56 -04:00
Mark Story
2728c6253e
Merge pull request #728 from boast/patch-2
...
TreeBehavior: Changed $Model->alias . '.' . $field to $Model->escapeField($field)
2012-08-01 19:41:04 -07:00
euromark
57bf15a415
multiple strpos to preg_match
2012-08-01 20:42:27 +02:00
euromark
319658e9d3
asserting escaped output for sms protocol
2012-08-01 12:48:21 +02:00
euromark
b6fe8af701
adding sms as protocol
2012-08-01 12:38:06 +02:00
euromark
2a674fc461
adding a test for the yet untested javascript protocol
2012-08-01 12:14:46 +02:00
euromark
f0ffe098d3
adding html helper tests for special protocols
2012-08-01 12:11:05 +02:00
euromark
b73be3139f
allowing tel protocol for mobile devices
2012-08-01 12:02:50 +02:00
Ceeram
2a0a5f2afa
Use the returned response instance from the event
2012-07-31 18:39:05 +02:00
mark_story
9b94133f0d
Fix uncaught exceptions when generating view cache files
...
Fixes #3016
2012-07-30 21:27:21 -04:00
Schlaefer
af8c5716fc
Added test for RSS to allow namespace tags if namespace is specified
...
If a namespace prefix is defined it's prefix should not be stripped
from the tag: `<dc:creator>` stays `<dc:creator>`.
Other prefixes are still stripped from the tag name.
This test is missing in 19f0e72d58
2012-07-30 10:10:19 +02:00
mark_story
4541510e26
Fix notice error when a missing action error is hit.
2012-07-29 22:37:41 -04:00
mark_story
7b939186a1
Fix ( and ) not being correctly handled by autoLinkUrls
...
Fixes #3077
2012-07-29 21:18:33 -04:00
Schlaefer
19f0e72d58
fix #2858 RSS helper bug with namedspaced keys
...
http://cakephp.lighthouseapp.com/projects/42648/tickets/2858-rss-helper-bug-with-namedspaced-keys
2012-07-29 14:24:46 +02:00
Rachman Chavik
5413b672eb
use is_subclass_of instead of comparing Acl.classname
2012-07-28 15:00:17 +07:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
mark_story
27e2132a13
Generated SQL should not contain multi-column primary keys
...
While totally valid in databases, the Schema system is not designed to
handle multi-column primary keys in a sane way. In MySQL this results in
two auto_increment columns, and in postgres this results in two serial
columns.
Fixes #3069
2012-07-27 22:31:49 -04:00
ADmad
99813e97b3
Implemented feature to allow individual "empty" values for date time select elements
2012-07-28 01:47:21 +05:30
mark_story
f963e378b5
Fix coding standards errors.
2012-07-26 21:22:50 -04:00
mark_story
6e0cf0dab7
Fix failing test.
2012-07-26 21:19:20 -04:00
Kyle Robinson Young
cbf5328b33
Fix failing test with controller task listAll
2012-07-25 22:12:55 -07:00
Mark Story
4dd532d3a9
Merge pull request #724 from SimonEast/h_encoding
...
Prevent booleans from being encoded (converted to strings) by h() function
2012-07-25 18:17:12 -07:00
Mark Story
a03166c5b6
Merge pull request #739 from tigrang/router-validate-route-fix
...
Fixed issue where restoring the default route class would cause an exception.
2012-07-25 18:16:21 -07:00
Mark Story
b99be9878a
Merge pull request #738 from zpencerq/authcomponentproblem
...
Auth Component can't return false from user($key)
2012-07-25 16:05:29 -07:00
Tigran Gabrielyan
851aa8bef4
Fixed issue in _validateRouteClass where setting defaultRouteClass back to CakeRoute would throw an exception
2012-07-25 14:13:25 -07:00
José Lorenzo Rodríguez
255705a81e
Merge pull request #714 from shin1x1/pr_server_shell_2.3
...
Added ServerShell for PHP Built-in Server into 2.3 branch.
2012-07-25 14:10:28 -07:00
Spencer Ellinor
8a41fb0c34
Fix issue and remove unneccesary code. The (fixed) conditional doesn't do anything, since if Hash::get returns null, the function still returns null.
2012-07-25 15:09:22 -04:00
Spencer Ellinor
6c1b05a5d4
Modify test case to show the issue.
2012-07-25 15:06:56 -04:00
Jorge González
7418be04d3
fixing translation domain to cake_dev
2012-07-25 19:20:30 +01:00
mark_story
7d74f3e598
Increase context depth in error messages.
...
Fixes #3063
2012-07-24 23:39:48 -04:00
mark_story
70c714d600
Fix incorrect context being used for excerpt.
...
Fixes #3064
2012-07-24 23:37:37 -04:00
euromark
2a553dcfd1
unified doctype for browser related layout templates
2012-07-24 18:06:39 +02:00
Jorge González
f9f380d401
using annotations for catching exceptions in tests
2012-07-24 14:09:48 +01:00
Jorge González
d7f93f5bcf
adding a related message to the enableCrypto InvalidArgumentException
2012-07-24 14:08:54 +01:00
mark_story
162d3bcb29
Fix whitespace errors.
2012-07-23 22:44:05 -04:00
mark_story
66b296527f
Add type check to prevent errors related to Hash::get()
...
Fixes #3041
2012-07-23 22:33:58 -04:00
David Thalmann
f926ae7637
Clean up string concatenations and refactored some reused strings into variables.
...
Refs #GH-729
Signed-off-by: mark_story <mark@mark-story.com>
2012-07-23 22:30:28 -04:00
mark_story
35bf3097cd
Fixing missing imports in generated tests.
...
Fixes #3059
2012-07-23 21:25:55 -04:00
Jorge González
17db6f9d23
Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls
2012-07-23 22:24:10 +01:00
mark_story
2359fb7e2e
Simplify number formatting.
2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137
Add bcrypt support to Security::hash()
2012-07-22 21:15:00 -04:00
mark_story
ed19821168
Merge branch 'master' into 2.3
2012-07-22 21:01:28 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076a
]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
2012-07-22 20:59:24 -04:00
euromark
15cf55d444
different approach on the failing test
2012-07-22 03:59:59 +02:00
euromark
93957bc3e4
fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself
2012-07-22 03:55:13 +02:00
Mark Story
f77bebcc38
Merge pull request #730 from dereuromark/2.3-missing-app-uses
...
another correction for app uses
2012-07-21 18:50:52 -07:00
euromark
93eb8c2c58
another correction for app uses
2012-07-22 03:38:39 +02:00
mark_story
71507796c7
Add docs.
2012-07-21 21:35:45 -04:00
mark_story
6ce4a3a1ec
Add tests for contentDisposition flag.
...
Fixes #3042
2012-07-21 21:22:04 -04:00
Joey Jan
9deb966657
Add ability to disable content-disposition for email attachments.
...
This solves issues with outlook and text/calendar attachments.
Refs #3042
2012-07-21 21:01:45 -04:00
mark_story
468302b526
Merge branch 'master' into 2.3
2012-07-21 20:59:56 -04:00
mark_story
6286b43329
Make tests pass on windows.
...
Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.
Refs #3055
2012-07-21 20:59:05 -04:00
mark_story
a27e171f0f
Invert default log configuration.
...
Windows only has 4 log levels instead of 8. This causes notice errors
when trying to use 'alert' and a few other levels.
Fixes #3055
2012-07-21 20:42:46 -04:00
mark_story
ab6fab6675
Add missing import.
2012-07-21 20:42:46 -04:00
David Thalmann
78de6e276a
Removed inline method calls in curly braced string concat's.
2012-07-22 03:40:49 +03:00
Jorge González
f1250a3609
Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls
2012-07-21 20:49:46 +01:00
Jorge González
55c92065c6
adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010
2012-07-21 20:28:38 +01:00
David Thalmann
d9b5ec1a3a
Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
2012-07-21 22:07:51 +03:00
euromark
01f1b0dadc
correcting previously added app uses statements
2012-07-21 20:29:49 +02:00
mark_story
2e71ef8f26
Add CakeSession Fixture
...
CakePHP should provide a fixture for the default session table name so
developers don't need to add the same fixture to each application.
Fixes #3054
2012-07-21 14:08:10 -04:00
Mark Story
f858ea3007
Merge pull request #726 from dereuromark/2.3-html-reporter-fix
...
only try to get comparison failure for the appropriate object
2012-07-21 07:02:34 -07:00
euromark
6557e3bafe
only try to get comparison failure for the appropriate object
2012-07-21 15:23:54 +02:00
Jorge González
27a895d7d8
adding enableCrypto() method to CakeSocket class
2012-07-21 14:23:47 +01:00
euromark
4fe1ab1bf6
missing app uses statements
2012-07-21 13:34:33 +02:00
Simon East
1ea457e40e
Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9
2012-07-20 12:48:57 +10:00
José Lorenzo Rodríguez
a7865b5d1d
Removing some new by reference calls
2012-07-19 14:24:12 -05:30
Mark Story
f65b52bf11
Merge pull request #722 from uzyn/bugfix/url-validation
...
Fix URL validation to allow underscores in subdomain.
2012-07-19 12:40:30 -07:00
Christian Winther
bce82a2322
Better custom find for pagination
...
Instead of shuffling the paginator settings you can now simply add a new "findType" key and it will automatically change the find() type accordingly
2012-07-19 15:57:51 +02:00
U-Zyn Chua
e7c4064a69
Fix URL validation to allow underscores in subdomain.
2012-07-19 20:51:33 +08:00
mark_story
473d55f091
Allow 1 second of slip.
2012-07-18 22:22:57 -04:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
mark_story
7979ee5fa0
Remove test that is no longer needed for validation.
2012-07-17 23:18:25 -04:00
Mark Story
83cef3ef9a
Merge pull request #718 from dereuromark/2.3-fix-validation-error-message
...
2.3 fix validation error message
2012-07-17 19:57:16 -07:00
mark_story
3b46cd43f1
Add logging and error when fixture creation fails.
...
This helps people find and solve issues faster/easier.
Fixes #3044
2012-07-17 22:48:50 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
euromark
e1357ca8aa
indentation in templates
2012-07-18 03:24:55 +02:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
euromark
760cf33ce3
make sure a missing validation rule always triggers a warning (in productive mode this will be logged in the log files)
2012-07-17 10:47:20 +02:00
mark_story
928de97338
Add additional tests for error triggering on missing validator.
...
Closes #3039
2012-07-15 19:47:28 -04:00
mark_story
2f7f5e1322
Use file cache as the default cache engine.
...
Too many people had issues using APC by default as its often configured
in strange ways, and works poorly on inexpensive hosting.
Fixes #2995
2012-07-15 09:11:27 -04:00
mark_story
cc44130fc0
Update version number to 2.2.1
2012-07-14 16:42:59 -04:00
mark_story
fb92bde0fe
Loosen exception types.
2012-07-14 16:18:21 -04:00
mark_story
22d4cb3794
Allow warnings for Xml entities.
...
For some installations libxml_use_internal_errors() does not work,
a warning is another way to measure the entities not being loaded.
2012-07-14 16:08:54 -04:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
6c905411ba
Fix XML decoding attack via external entities.
2012-07-14 11:53:37 -04:00
shin1x1
32d5f113d3
fixed phpcs errors.
2012-07-14 16:47:33 +09:00
mark_story
46f8de72a2
Fix web runner showing fails as passes when show_passes is on.
...
Fixes #3035
2012-07-13 22:58:07 -04:00
shin1x1
dd524c96e1
Added ServerShell for PHP Built-in Server.
2012-07-13 02:29:42 +09:00
mark_story
8fc5726920
Remove trailing whitespace.
2012-07-11 21:39:32 -04:00
mark_story
3baaecc81c
Type check before unset()
...
Calling unset() on string indices fails fatally on 5.3.x and lower.
Fixes #3027
2012-07-11 15:54:24 -04:00
mark_story
b7415525c8
Fix missing line breaks.
...
Fixes #3028
2012-07-11 15:51:07 -04:00