Commit graph

16448 commits

Author SHA1 Message Date
mark_story
888b1f4795 Fix issue with using contain() and query[contain]
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
2012-10-20 14:51:52 -04:00
mark_story
f457f07b5c Force field validation to use sha1
When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
2012-10-18 21:26:26 -04:00
euromark
5a8092fc1b allow ini files to have separators between sections for better readability
dump now makes spaces between sections in init files
2012-10-18 17:20:15 +02:00
mark_story
ea467e72d7 Swap isset() for array_key_exists()
Fixes #3283
2012-10-17 17:23:08 -04:00
mark_story
307759516b Try to make tests less fragile. 2012-10-15 22:54:03 -04:00
mark_story
1cc82ff39f Merge branch 'master' into 2.3 2012-10-15 21:48:55 -04:00
mark_story
6d3ae3b83c Fix missed use of VERSION. 2012-10-15 21:48:36 -04:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
mark_story
f6c5ceb77a Use id() as VERSION doesn't exist in phpunit 3.6 2012-10-15 21:38:10 -04:00
mark_story
f89fe0e1ef Fix tests that fail in PHPUnit 3.7
Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
2012-10-15 21:36:12 -04:00
Mark Story
805b44f17c Merge pull request #904 from ataylor32/remove-trailing-whitespace
Remove trailing whitespace from comments
2012-10-15 17:30:28 -07:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
2a803ea412 Add missing import
Refs GH-877
2012-10-14 22:22:46 -04:00
mark_story
3e0fa0009b Show the last 200 queries instead of the first 200.
Fixes #3273
2012-10-14 21:30:28 -04:00
Graham Weldon
41ae19b5bc Removed spaces at the end of lines. 2012-10-15 11:44:31 +11:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly.
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
2012-10-14 11:58:07 -04:00
ADmad
56a0eb04b7 Fix incomplete patch 61dd1098d3 2012-10-14 18:44:10 +05:30
Mark Story
7ea3ee466d Merge pull request #899 from dereuromark/2.3-more-tests
default value null makes more sense. add test cases for false.
2012-10-13 18:28:34 -07:00
ADmad
61dd1098d3 Allow specifying tag for current page number. Closes #2892 2012-10-13 12:34:00 +05:30
mark_story
513851d1c1 Update skel directory logging configuration. 2012-10-13 02:29:25 -04:00
euromark
17be6d0472 remove default value for debug's first argument 2012-10-12 16:14:17 +02:00
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
ADmad
8bc17996dc Update docblock 2012-10-11 20:00:30 +05:30
José Lorenzo Rodríguez
036c24937d Merge pull request #896 from dereuromark/master-test-cases-fix
remove duplicate line
2012-10-11 05:55:28 -07:00
euromark
2dfb40bac0 remove duplicate line 2012-10-11 14:54:11 +02:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES.
Fixes #3256
2012-10-11 08:39:46 -04:00
mark_story
8800d7bdec Reduce duplication in test case. 2012-10-11 08:28:59 -04:00
mark_story
b1dfab87e4 Fix autoLinkUrls so it re-capture query strings.
Fixes #3296
2012-10-11 08:28:59 -04:00
euromark
1e2ac0b9c8 comp mod for saveAll()
better approach

test case to assert saveAll still behaves like previous versions
2012-10-11 14:03:59 +02:00
ADmad
f06bdde8c6 Fix docblock 2012-10-11 12:33:46 +05:30
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
Mark Story
4acc687dcd Merge pull request #890 from dereuromark/master-not-empty-validation
Fix validation error domain for notEmpty
2012-10-09 14:52:11 -07:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
Mark Story
2e15689d19 Merge pull request #892 from dereuromark/router-fix
avoid offset -1 error on tests etc
2012-10-09 05:01:06 -07:00
euromark
0197700e4f simplify check 2012-10-09 12:24:10 +02:00
euromark
2cff67184f avoid offset -1 error on tests etc 2012-10-09 11:49:44 +02:00
ADmad
33a879ff41 Fix find('count') with 'group' when result has only one group. Closes #1677 2012-10-09 10:43:27 +05:30
mark_story
1234f96a6c Update version number to 2.2.3 2012-10-08 20:15:03 -04:00
mark_story
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
72f4d4fac0 Fix issue with logging scopes
Logging scopes should be exclusive and not allow messages matching on
level alone to be logged.  By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.

Fixes #3264
2012-10-08 12:57:02 -04:00
mark_story
a59db11e4e Update doc blocks for logging + scopes. 2012-10-08 11:41:32 -04:00
mark_story
2232c7e15d Update doc blocks to reflect reality.
Closes #3263
2012-10-08 10:58:53 -04:00
ADmad
a1aa73c1a2 Cache character set names 2012-10-07 21:58:49 +05:30
euromark
e85b2a072a fix validation error domain for notEmpty
$this->_validationDomain for default notEmpty message

notEmpty default error message
2012-10-07 14:17:31 +02:00
AD7six
fa6defea37 url encode nested named parameters in unmatched routes
reference: #2988
and 31033239bd
2012-10-05 11:40:58 +02:00
mark_story
972d5752bf Improve error message.
Fixture datasources must begin with test so you don't accidentally use
a real datasource.

Fixes #3254
2012-10-04 20:41:02 -04:00
AD7six
52f206064d unbrake Console/cake on osx 2012-10-04 21:41:22 +02:00
AD7six
5140baf83d Load routes as late as possible.
As a concequence - routes will also work by default in the cli
2012-10-04 21:41:12 +02:00
mark_story
57f81da983 Fix variable naming. 2012-10-04 11:27:24 -04:00
ADmad
1c0492eb8b Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591 2012-10-04 18:40:57 +05:30