Mark Story
eea56d3f23
Merge pull request #1648 from dereuromark/master
...
cs corrections
2013-09-17 07:05:14 -07:00
euromark
e3a3946e89
address casting cs
2013-09-17 15:15:25 +02:00
euromark
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
5ec9b145bf
Fix label element for attributes not matching their inputs.
...
Radio elements would contain ModelModelFieldValue instead of
ModelFieldValue like they should. This was caused by the fix for #3936
and lack of tests for create() + radio().
Fixes #4071
2013-09-16 22:38:28 -04:00
Mark Story
aee71fad11
Merge pull request #1646 from spiliot/patch-1
...
removed duplicate test case in CakeRequest Referer
2013-09-16 14:52:30 -07:00
spiliot
37c9832dc1
removed duplicate test case
...
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
mark_story
4ea6c158d1
Fix wording and remove trailing spaces.
2013-09-16 12:04:29 -04:00
Mark Story
9df34967f5
Merge pull request #1645 from ShinKenDo/patch-1
...
Improved wording of Model::invalidFields()
2013-09-16 09:03:53 -07:00
Jerome Roethlisberger
3a4a0e54eb
Improved wording of Model::invalidFields()
...
Inspired by
http://book.cakephp.org/2.0/en/models/data-validation/validating-data-from-the-controller.html#validating-data-from-the-controller
2013-09-16 16:13:58 +02:00
euromark
c8b18164c5
fix test
2013-09-16 00:49:01 +02:00
euromark
910ee33710
remove wrong trailing slash
2013-09-16 00:40:37 +02:00
mark_story
085636ea1b
Update version number to 2.4.1
2013-09-14 22:07:19 -04:00
mark_story
7379d32b59
Simplify & fix phone number validation.
...
The changes made in fa3d4a0bb5Fixes #4066
2013-09-13 23:05:40 -04:00
Mark Story
2ec54fba50
Merge pull request #1632 from ravage84/cakelog_config
...
Corrected a CakeLog example in a DocBlock about scopes and types
2013-09-12 20:20:51 -07:00
Marc Würth
0a7d5b9c3f
Corrected a CakeLog example in a DocBlock about scopes and types
...
> Its important to remember that
> when using scopes you must also define the `types` of log messages
> that a logger will handle. Failing to do so will result in the logger
> catching all log messages even if the scope is incorrect.
According to this the previous example would fail to log correctly.
2013-09-13 03:07:46 +02:00
mark_story
ba4afcc074
Fix incorrectly encoded address fields.
...
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.
Fixes #4058
2013-09-12 20:14:11 -04:00
Mark Story
ba016c2c68
Merge pull request #1630 from dereuromark/master-cleanup
...
Master cleanup
2013-09-12 16:46:18 -07:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
ovidiupruteanu
f416a321c7
flushMethodCache not working if called before cacheMethod
...
When calling flushMethodCache it correctly empties self::$methodCache but if cacheMethod is called afterwards self::$methodCache gets populated with data from the Cache.
2013-09-12 22:02:39 +03:00
Mark Story
8f2bd51834
Merge pull request #1628 from ravage84/sqlserver-elseif
...
Replaced two elseifs by if in sqlserver datasource
2013-09-11 16:22:46 -07:00
Marc Würth
446792987a
Replaced two elseifs by if in sqlserver datasource
2013-09-11 23:15:05 +02:00
Mark Story
a980fd92b9
Merge pull request #1626 from ataylor32/pr-printf
...
Make the "pr" function use `printf` instead of `echo sprintf`
2013-09-10 19:29:05 -07:00
Adam Taylor
186f2a27e0
Make the "pr" function use printf instead of echo sprintf
2013-09-10 19:52:18 -06:00
Mark Story
fd50c5277e
Merge pull request #1624 from ADmad/fix-paginator-order
...
Fix setting of order in Paginator options when using model's order.
Refs #3902
2013-09-10 13:41:51 -07:00
Mark Story
232bbc0bae
Merge pull request #1625 from dereuromark/master
...
add missing params for parent call
2013-09-10 13:01:42 -07:00
euromark
beff12d8a5
add missing params for parent call
2013-09-10 21:19:30 +02:00
ADmad
e77a75147f
Merge pull request #1623 from bar/php54-afterFind
...
Update afterFind() callback signature to be PHP5.4+ compliant.
2013-09-10 11:55:07 -07:00
ADmad
1d0c785725
Fixed setting of order in Paginator options when using model's order. Refs f680c76, #3902
2013-09-10 22:47:31 +05:30
Ber Clausen
0a52061d86
Update afterFind() callback signature to be PHP5.4+ compliant.
2013-09-10 14:15:01 -03:00
Mark
994a5b00b6
Merge pull request #1622 from bar/php54-afterSave
...
Update Model/Behavior afterSave() callback signature to be PHP5.4+ compliant.
2013-09-10 04:04:04 -07:00
mark_story
fc2e1fac4e
Fix clearing groups with FileCache and no prefix.
...
If you used FileCache + groups + an empty prefix cached files would not
be cleared as strpos() would fail.
2013-09-09 22:24:18 -04:00
Ber Clausen
867d4b312d
Update afterSave() callback signature to be PHP5.4+ compliant.
2013-09-09 21:34:11 -03:00
Ber Clausen
98a32c334a
Fix CS.
2013-09-09 21:25:22 -03:00
mark_story
5210f831c8
Add test for insertMulti with id in the last spot.
...
Both tests work, so there are no changes to the implementation.
Closes #4048
2013-09-09 19:43:15 -04:00
mark_story
2fc3222322
Fix whitespace.
2013-09-09 12:20:54 -04:00
Mark Story
1499723252
Merge pull request #1620 from ovidiupruteanu/patch-1
...
Fixed handling null values in Sqlserver->value().
Fixes #3768
2013-09-09 09:20:05 -07:00
ovidiupruteanu
7019c79b81
Quoting test for null value and string column
2013-09-09 17:14:09 +03:00
ovidiupruteanu
b58940e9b5
Fixed handling null values in Sqlserver->value
...
The value function quoted a null value as N'' instead of NULL.
As a result is produced queries like [name] IS N'' instead of [name] IS NULL which resulted in an SQL error.
2013-09-09 16:33:54 +03:00
Mark Story
86bee4de09
Merge pull request #1613 from bar/json-view
...
JsonView should return null if no data is set, regardless of the type of '_serialize'.
2013-09-07 07:45:00 -07:00
Ber Clausen
c3ee9a2058
JsonView should return null if no data is set, regardless of the type of '_serialize'.
...
It should also honor true/false/0/'' values.
2013-09-07 02:38:52 -03:00
Mark Story
f82814d7ac
Merge pull request #1618 from dereuromark/master-cs
...
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 11:11:24 -07:00
euromark
959988cfa1
Remove last yoda conditions as per coding standards guidelines.
2013-09-06 18:36:57 +02:00
mark_story
0891073d19
Add coding standards ignore comments to FileEngine
...
We normally disallow error supression but it is the only way to
atomically delete files.
2013-09-06 12:19:23 -04:00
Mark Story
af3065d377
Merge pull request #1617 from davidsteinsland/master
...
Fixed race conditions for FileEngine.
Using file_exists() and unlink() together does not ensure atomic results.
2013-09-06 09:16:13 -07:00
davidsteinsland
45b3417bd7
Fixed race conditions for FileEngine
2013-09-06 15:46:01 +02:00
Mark Story
0f528c279a
Merge pull request #1614 from okinaka/2.x-disused-code
...
Postgres::truncate(): Delete disused code.
2013-09-05 18:16:22 -07:00
Mark Story
66394f2201
Merge pull request #1610 from bar/php54-callback-signatures
...
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
This may require updates to userland behaviours.
2013-09-05 11:11:15 -07:00
mark_story
6a6371b2d4
Fix CROSS JOINs
...
While seldomly used, CROSS joins should not generate invalid SQL.
Fixes #4050
2013-09-05 12:45:48 -04:00
mark_story
e3e4efba0a
Add test for issue #3936
...
radio() method should accept an array for the label element.
Refs #3936
2013-09-05 11:04:47 -04:00
