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
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
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
29ac5f1d8c
Merge pull request #1600 from aleho/master
...
Load helpers of email view
2013-09-02 06:03:43 -07:00
Alexander Hofbauer
78d5b69bec
Load helpers of email view
2013-09-02 14:36:08 +02:00
Mark Story
863abf2a7f
Merge pull request #1599 from mvdriel/fix-identing
...
Fixed identing and spacing
2013-09-02 04:46:51 -07:00
Mark van Driel
38820e0a16
Fixed identing and spacing
2013-09-02 13:22:44 +02:00
mark_story
229c824da6
Remove a default helper from View.
...
This goes back to the days of yore and combined with
b8320fdbb7
it causes issues. The specific
issue at hand was testing a helper that uses other aliased helpers
(HtmlHelper specifically). The core helper would always be loaded
instead of the aliased one.
2013-09-01 21:39:59 -04:00
aread22
4ab1c8c225
Format to CakePHP code sniffs
2013-09-01 21:08:17 -04:00
aread22
64bb74a7e8
Potential Fix for LightHouse Ticket #3936
...
I believe I found a fix for this issue. I am here at #CakeFest2013 and during the #HourOfContribution I ran across this issue.
Currently in CakePHP 2.4 on Line 1522 - 1524 you can see the following code:
@@@ php
if ($label) {
$optTitle = $this->Html->useTag('label', $tagName, '', $optTitle);
}
@@@
The $label variable here the is the $label array passed into the input method in Sethathi example above. The problem is that the $label array is completely ignored and instead a label is created using the HtmlHelper->useTag method.
I have what I believe is a fix for this issue but it hasn't been extensively tested. I tested against Sethathi example in the ticket and it produced the correct result.
The fix is simple. We detect if an array is passed in and then send it to the FormHelper label method instead of the HtmlHelper useTag method. The FormHelper label methods accepts an options array, so we pass in the $label array.
This will probably need to be fixed for checkbox also
"ask":https://cakephp.lighthouseapp.com/users/235987 helped me with this fix
2013-09-01 20:56:44 -04:00
José Lorenzo Rodríguez
5f4feb0729
Merge pull request #1594 from mreishus/feature-readline-support
...
Use readline in console when supported
2013-09-01 15:51:32 -07:00
Matt Reishus
bb98ac761f
ConsoleInput::_canReadLine change from private -> protected
2013-09-01 17:15:51 -05:00
Matt Reishus
3b057cb82b
Correct style
2013-09-01 16:58:23 -05:00
Matt Reishus
916d992162
Use readline in console when supported
...
$this->stdin->read(); will use readline if the system is detected to
support it. In linux, you will be able to use the left and right arrow
keys to edit the current line, use the up and down keys to navigate
history, press ^U to delete the entire line, etc.
Before this, using arrow keys in linux will just spam characters like
^[[C^[[A^[[D^[[C^[[A^. Useful for "Console/cake console"
2013-09-01 16:20:29 -05:00