Jose Lorenzo Rodriguez
0d80c92ffb
Revert "Merge pull request #3002 from moberemk/patch-2"
...
This reverts commit 8e3d6cffb7
, reversing
changes made to 92800889a6
.
2014-04-06 21:48:59 +02:00
José Lorenzo Rodríguez
8e3d6cffb7
Merge pull request #3002 from moberemk/patch-2
...
Allow chaining in the addCrumb method
2014-04-06 21:09:10 +02:00
mark_story
92800889a6
Update version number to 2.4.7
2014-04-04 22:25:48 -04:00
mark_story
7fb920c256
Add file missed in last commit.
2014-04-04 22:22:38 -04:00
mark_story
4ec81542db
Fix email rendering when using 2 different plugins.
...
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.
Fixes #3062
2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee
Only count _id
if it is the last 3 characters in the field name.
...
This prevents issues when baking models for tables containing `_id`.
Fixes #3230
2014-04-04 21:26:31 -04:00
Mark Story
c92769c980
Merge pull request #3224 from dereuromark/master-deprecations
...
correct deprecation notices
2014-04-04 14:04:53 -04:00
euromark
854a53b3cb
generalize sentence
2014-04-04 19:19:10 +02:00
euromark
823909603a
correct deprecation notices
2014-04-04 19:18:02 +02:00
Ceeram
5c31641ea8
Change argument type to mixed in docblock, as debug() and pr() accept not just a single type
2014-04-02 23:53:54 +02:00
José Lorenzo Rodríguez
bf28e69501
Merge pull request #3197 from dereuromark/master-cs
...
cs
2014-04-02 08:32:26 +02:00
euromark
b150e33472
correct missed cs errors
2014-04-02 03:16:03 +02:00
euromark
e544340d67
fix indentation
2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439
more cs
2014-04-02 03:09:42 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
euromark
44952b06a4
cs
2014-04-02 02:23:43 +02:00
ADmad
7a4a806db1
Merge pull request #3193 from beporter/feature/phpunit-required-version
...
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 21:54:28 +05:30
Brian Porter
e5dd8acb60
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 11:08:46 -05:00
Mark
997154565f
Merge pull request #3186 from bcrowe/hotfix-yoda-test
...
Fix yoda condition in File test
2014-04-01 00:56:29 +02:00
Bryan Crowe
b93f373f16
Fix yoda condition in File test
2014-03-31 17:40:35 -04:00
Mark Story
d3855f869a
Merge pull request #3156 from sam-at-github/acl-shell-delete-all
...
Make `cake acl delete <acl-object>` delete all matching records.
2014-03-29 08:58:04 -04:00
sam-at-github
dbbf6c6ad9
No array short syntax in 2.4\!
2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9
Fixed CS issues. Fixed bug - added missing condition to find.
2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245
on cake acl delete <>
delete all matching records. Makes more sense than deleting one of possibly many.
2014-03-29 13:37:08 +11:00
Mark Story
77db212b38
Merge pull request #3146 from sam-at-github/baseauthorize-crud
...
Removed arbitrary restriction on crud operations in BaseAuthorize.
2014-03-28 07:10:36 -04:00
sam-at-github
5ceb4abe1a
Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better.
2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43
Update doc blocks to not be lies.
2014-03-27 11:55:54 -04:00
mark_story
de9a5a5845
Add deprecated flag to methods that are removed in 3.0.
...
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.
Refs #3105
2014-03-23 20:40:17 -04:00
mark_story
75fcc7c2f8
Don't use count() in a loop.
...
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
2014-03-23 11:00:59 -04:00
Mark Story
90ca41d436
Merge pull request #2941 from lucasff/master
...
Allow the passing parameter escape of the getCrumbList method
2014-03-23 09:23:06 -04:00
mark_story
a801be30d9
Use alternate quoting in assertTags()
...
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
2014-03-21 22:53:25 -04:00
mark_story
f12b272758
Fix a few flaky/bad attribute matchers.
2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a
Make assertTags() run much faster.
...
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.
Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.
Fixes #3072
2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb
Fix typo.
2014-03-21 22:52:52 -04:00
mark_story
a827b96804
Clean up doc blocks for assertTags.
2014-03-21 22:52:52 -04:00
Mark Story
7f96a772be
Merge pull request #3089 from jameswatts/feature/dbosource-circular-reference
...
Update in_array() check to avoid fatal error
2014-03-21 14:41:13 -04:00
James Watts
2eadb89ff6
Update in_array() check to avoid fatal error
...
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
2014-03-21 16:16:32 +01:00
Mark Story
514974900f
Merge pull request #3021 from wvdongen/master
...
Fixed bug where select query in deleteAll could return wrong table name
2014-03-21 08:21:24 -04:00
Mark Story
8c81cec904
Merge pull request #3069 from wbkostan/master
...
Modifications to singulizer rules for Inflector.php. Supported with test cases
2014-03-19 20:32:28 -04:00
wbkostan
fea60bfe51
Update InflectorTest.php
...
Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.
2014-03-19 19:17:52 -04:00
wbkostan
9a36ed5785
Update Inflector.php
...
Modified singularizer inside inflector to accurately inflect most words ending in -aves. Removed irregular cases solved by this fix.
2014-03-19 19:12:44 -04:00
Mark Story
c53131f434
Merge pull request #3066 from ravage84/patch-1
...
testcases => test cases
2014-03-19 13:09:29 -04:00
Marc Würth
c6f723059c
testcases => test cases
2014-03-19 17:30:10 +01:00
euromark
97c148a170
Correct typo
2014-03-19 12:47:31 +01:00
mark_story
ee895a8bb1
Add form attribute to hidden inputs when present.
...
If inputs are placed outside of the form elements the form attribute
needs to be set on the hidden inputs. Without this attribute the empty
state does not submit correctly.
Fixes #3053
2014-03-18 22:11:57 -04:00
Mark Story
23350eb89e
Merge pull request #3051 from occitech/master
...
Themed CakeEmail should load view helpers with the theme set
2014-03-18 10:07:24 -04:00
Hadrien
d55a167830
Themed CakeEmail should load view helpers with the theme set
2014-03-18 14:22:24 +01:00
mark_story
d559e429e6
Merge branch 'http-response-code' into master.
...
Merge changes from #3016 into master.
Closes #3016
2014-03-17 13:09:03 -04:00
mark_story
9888209e9a
Add tests and fix issues with multiple trailing whitespaces.
...
Closes #3016
2014-03-17 13:08:46 -04:00
Wouter van Dongen
5035613157
* Fixed bug where select query in deleteAll could return wrong table name.
...
PDOStatement::getColumnMeta (in mysql.php) sometimes returns the actual
table name when using a MySQL view with the distinct select query, and not
the alias table name. By returning the actual table name the records
could not be removed.
By the way PDOStatement::getColumnMeta is an experimental function,
perhaps it's better to avoid it.
2014-03-14 15:20:12 +01:00