Simon Males
50ad043092
View::get() default param test
2013-09-11 22:22:50 +08:00
Simon Males
0c3197a435
View::get() to support a fallback param
2013-09-11 11:10:27 +08: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
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
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
Christian Winther
a1866733a0
Merge pull request #1611 from ADmad/2.4-log-suffix
...
Dropping 'Log' suffix from log configs as per change in cb24dbb084
.
2013-09-05 07:24:41 -07:00
mark_story
f22c4cf90b
Merge branch 'master' into 2.5
2013-09-05 10:21:41 -04:00
mark_story
3c9500a3cb
Fix whitespace error.
2013-09-05 10:21:24 -04:00
Mark Story
f191ff017b
Merge pull request #1597 from aread22/master
...
Potential Fix for LightHouse Ticket #3936
Fixes #3936
2013-09-05 07:20:48 -07:00
Ber Clausen
c524645738
Update Model/Behaviors callback signature to be PHP5.4+ compliant.
2013-09-05 11:17:02 -03:00
ADmad
29d0e26710
Dropping 'Log' suffix from log configs as per change in cb24dbb084
.
...
Reverts regressive change done in 7e28636a72
.
2013-09-05 19:37:41 +05:30
José Lorenzo Rodríguez
77c453b2a3
Merge pull request #1609 from Schlaefer/patch-1
...
performance improvements in CakeTime::timeAgoInWords
2013-09-05 03:44:01 -07:00
Schlaefer
82da8d9d07
performance improvements in CakeTime::timeAgoInWords Edit
...
- rearranges code to move return statements before otherwise dead code
- only do translation if translated string is actually used
2013-09-05 12:22:28 +02:00
Mark Story
6e6748955a
Merge pull request #1607 from chadrien/patch-1
...
Fix log classname in skeleton
2013-09-05 03:18:24 -07:00
Hadrien Collongues
7e28636a72
Fix log classname in skeleton
...
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
2013-09-05 11:20:39 +02:00
okinaka
e0f24d0ade
Postgres::truncate(): Delete disused code.
2013-09-05 14:11:50 +09:00
aread22
cb056a5cbe
Use FormHelper->label instead of HtmlHelper->useTag
...
Implementing suggested fix by mark_story
2013-09-04 13:32:36 -04:00
José Lorenzo Rodríguez
85e47169b0
Merge pull request #1605 from robmcvey/inflector
...
Plural of brief is briefs not brieves
2013-09-04 01:23:08 -07:00
Rob McVey
7f44cc01b5
Plural of breif is breifs not breives
2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada
Reorder inflection rules.
...
Place rules for words like 'archives' and 'relatives' before words like
'knives'.
Fixes #4040
2013-09-03 12:50:02 -04:00
mark_story
800ffa804b
Fix invalid CSS in fixture files.
...
Fixes #4041
2013-09-03 09:55:04 -04:00
Mark Story
0c82058f98
Merge pull request #1601 from ravage84/schema-shell
...
Shortened the if clause line length by doing it the @markstory style ;-)
2013-09-02 12:43:12 -07:00
Marc Würth
84a669aa7a
Shortened the if clause line length by doing it the @markstory style ;-)
...
Also shortened the line length of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00